diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index b5bae2ff9fb..b8b76f7355e 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -5,8 +5,7 @@ This file contains a list of the package IDs which are patching in a given relea CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky. When adding a new package, make sure the new line ends with a semicolon and starts with a space. -Later on, this will be checked using this condition: - +Directory.Build.props checks this property using the following condition: $(PackagesInPatch.Contains(' $(PackageId);')) --> @@ -14,26 +13,7 @@ Later on, this will be checked using this condition: $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - Microsoft.Extensions.Logging.AzureAppServices - - - - - Microsoft.Extensions.Configuration.Binder; - Microsoft.Extensions.Configuration.EnvironmentVariables; - Microsoft.Extensions.Configuration.KeyPerFile; - - - - - Microsoft.Extensions.Diagnostics.HealthChecks; - Microsoft.Extensions.Logging.AzureAppServices; - Microsoft.Extensions.Caching.StackExchangeRedis; - - - + diff --git a/eng/Versions.props b/eng/Versions.props index 14703d49182..1840cd5a492 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,9 +8,9 @@ 3 0 - 0 + 1 $(MajorVersion).$(MinorVersion).$(PatchVersion) - rc2 + servicing $(VersionPrefix).0 $(MajorVersion).$(MinorVersion).0.0 0.1.$(PatchVersion) + + true - true + true $(MajorVersion).$(MinorVersion).$([MSBuild]::Subtract($(PatchVersion), 1)) - true + false release @@ -102,14 +109,4 @@ 4.5.2 4.5.0 - - - $(RestoreSources); - https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; - - - $(RestoreSources); - https://dotnet.myget.org/F/roslyn/api/v3/index.json; - - diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 7a3a18ba021..05aabfdd8d3 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -1,7 +1,26 @@ + true + ResolveCustomReferences; $(ResolveReferencesDependsOn); @@ -20,7 +39,8 @@ --> true true - true + true false - true + true true false diff --git a/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj b/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj index 7c439bb7c19..f00ec1d0d71 100644 --- a/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj +++ b/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj @@ -2,7 +2,11 @@ netcoreapp3.0 - true + + + false + true + false true @@ -23,7 +27,7 @@ false false - + false @@ -31,7 +35,8 @@ - + + @@ -43,12 +48,16 @@ $(BuildDependsOn); _ResolveTargetingPackContent; + + + - + +