diff --git a/NuGet.config b/NuGet.config index 6f447ede5c2..694a158c28a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,10 @@ + + @@ -17,11 +19,13 @@ + + diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 233ed25ee33..def62c9b0fc 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,230 +2,230 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - - - - + + + + - - - - + + + + - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - + - + - + - + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 @@ -238,358 +238,358 @@ - 3.1.12 + 3.1.13 - - - + + + - - - + + + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - 3.1.12 + 3.1.13 - - - - + + + + - - - - + + + + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - - - + + + - - - + + + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - - - - + + + + - - - - + + + + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - - - - + + + + - - - - + + + + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - - - - - + + + + + - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - - - + + + - - - + + + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - + - + - + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - - - - + + + + - - - - + + + + - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 @@ -598,20 +598,20 @@ - 3.1.12 + 3.1.13 - - + + - - - + + + - 3.1.12 + 3.1.13 @@ -619,7 +619,7 @@ - 3.1.12 + 3.1.13 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 627dd6ff5bf..bd2f4067580 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,58 +4,58 @@ This file contains a list of all the packages and their versions which were rele build of Extensions. Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6ee155b94e..d7ae3def9a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -66,9 +66,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - 059a4a19e602494bfbed473dbbb18f2dbfbd0878 + 9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -82,21 +82,21 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0267ad09c6f2e2a37b23b7d230ffbf9e787dd388 + 64df28ec4a52d6cc23efffbb918eab87ee42600f https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 3acd9b0cd16596bad450c82be08780875a73c05c - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0267ad09c6f2e2a37b23b7d230ffbf9e787dd388 + 64df28ec4a52d6cc23efffbb918eab87ee42600f - + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - 50a99d5d3c6e68aecf70627897c0d862a92fc283 + 9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e diff --git a/eng/Versions.props b/eng/Versions.props index a4e8b002339..dbf97407ea7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 3 1 14 - false + true $(MajorVersion).$(MinorVersion).$(PatchVersion) servicing @@ -58,8 +58,8 @@ 3.1.6 3.1.0 - 3.1.12 - 3.1.12-servicing.21069.9 + 3.1.13 + 3.1.13-servicing.21116.2 2.1.0 1.1.1 @@ -76,11 +76,11 @@ 4.7.0 4.7.0 4.7.0 - 4.7.1 + 4.7.2 4.7.2 4.7.1 - 3.1.4 + 3.1.5 1.0.0-beta.21110.10 diff --git a/global.json b/global.json index 953730c4413..cfca96035a3 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "3.1.112" + "version": "3.1.113" }, "tools": { - "dotnet": "3.1.112", + "dotnet": "3.1.113", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppInternalPackageVersion)"