diff --git a/NuGet.config b/NuGet.config index 0947a28a3..95520261c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,8 +10,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 272b8bbc4..b40e75b9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,25 @@ - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + f3f2dd583fffa254015fc21ff0e45784b333256d - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + f3f2dd583fffa254015fc21ff0e45784b333256d - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + f3f2dd583fffa254015fc21ff0e45784b333256d - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + f3f2dd583fffa254015fc21ff0e45784b333256d - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - - - https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - - - https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + f3f2dd583fffa254015fc21ff0e45784b333256d @@ -35,33 +27,43 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 + + + https://github.com/dotnet/core-setup + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + + + + https://github.com/dotnet/core-setup + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 - + https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 - + https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 - + https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 - + https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 https://github.com/dotnet/test-templates @@ -84,13 +86,13 @@ ee2dc9d1a446ba70b39043443e1e99a659c8a9c3 - + https://github.com/dotnet/winforms - 24b0195c1f4c4a707ca6c3a3bd4715a65fcd8bfe + 2204c3f17bea70ee01be3b450f6b84158a80c154 - + https://github.com/dotnet/wpf - e85bb34bcb91bf7b8859d6fd84fd440508498aea + c8a08a25cbde21c5d45048a8719b1c64216402f7 diff --git a/eng/Versions.props b/eng/Versions.props index 026994ff3..5d08f1e8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-rtm.19568.1 + 4.8.1-servicing.19576.3 - 3.1.0-rtm.19572.4 + 3.1.0-rtm.19576.3 @@ -38,10 +38,10 @@ 3.1.0 3.1.0 - 3.1.0-rtm.19573.3 - 3.1.0-rtm.19573.3 - 3.1.0-rtm.19573.3 - 3.1.0-rtm.19573.3 + 3.1.0-rtm.19575.14 + 3.1.0-rtm.19575.14 + 3.1.0-rtm.19575.14 + 3.1.0-rtm.19575.14 @@ -61,13 +61,13 @@ - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.9 + 3.1.1-servicing.19576.9 + 3.1.1-servicing.19576.9 + 3.1.0 + 3.1.1-servicing.19576.9 + 3.1.1-servicing.19576.9 + 3.1.0 2.1.0 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 7cf525f5f..ec327aedd 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -15,9 +15,9 @@ $(MicrosoftNETCoreAppInternalPackageVersion) - $(CoreSetupBlobVersion) - $(AspNetCoreBlobVersion) - $(CoreSetupBlobVersion) + 3.1.0 + 3.1.0 + 3.1.0 3.0.0