diff --git a/NuGet.config b/NuGet.config index fbfd3a6251d7..53b7faa2a8c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,17 +10,19 @@ - - + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 783b33db99ff..61aff8fb7475 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + 4fa7338ac4da08dd24c06a0fb4217e6b68f261f9 - + https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + 4fa7338ac4da08dd24c06a0fb4217e6b68f261f9 - + https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + 4fa7338ac4da08dd24c06a0fb4217e6b68f261f9 - + https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + 4fa7338ac4da08dd24c06a0fb4217e6b68f261f9 - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + 40e6075d885cc35cadd6d754092f82557c8eaf95 - + https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + 40e6075d885cc35cadd6d754092f82557c8eaf95 - + https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + 40e6075d885cc35cadd6d754092f82557c8eaf95 - + https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + 40e6075d885cc35cadd6d754092f82557c8eaf95 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - d77ef3b1a253a99d0be23cec35e84d2fb3317ac5 + b506aef57160b27d2ca66f75a80f3237a91c8fec - + https://github.com/dotnet/wpf - eb2c28846bd06cc11a0cd432d55639a850a829a3 + daef397783c969da29b77e4b4021d38faafbd575 https://github.com/dotnet/fsharp @@ -148,11 +148,11 @@ https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df - + https://github.com/dotnet/roslyn - 12b11685a551e0a6a203dcecb584f610f4df1157 + f43cd10b737b6343956dee421cff8c50b602c788 diff --git a/eng/Versions.props b/eng/Versions.props index f08343dc9e07..2a7a56e8b1b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release rtm @@ -48,11 +48,11 @@ - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23524.4 @@ -72,13 +72,13 @@ - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 0.2.0 @@ -86,24 +86,24 @@ 8.0.100 - 8.0.100-rtm.23524.25 - 8.0.100-rtm.23524.25 + 8.0.100-rtm.23525.10 + 8.0.100-rtm.23525.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23524.2 + 4.8.0-3.23524.11 - 8.0.0-rtm.23523.12 + 8.0.0-rtm.23524.7 - 8.0.0-rtm.23523.12 - 8.0.0-rtm.23523.12 + 8.0.0-rtm.23524.7 + 8.0.0-rtm.23524.7 8.0.0 8.0.0 8.0.0 @@ -112,10 +112,10 @@ - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23524.9 + 8.0.0-rtm.23524.9 + 8.0.0 + 8.0.0 diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs index 8ab1a9600031..d80eb8e548a6 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs @@ -58,7 +58,8 @@ public void VerifyVersionFile() string[] sdkVersionLines = File.ReadAllLines(Path.Combine(outputDir, sdkVersionPath)); string expectedSdkVersion = sdkVersionLines[1]; - Assert.Equal(expectedSdkVersion, sdkVersion); + // Disable due to https://github.com/dotnet/source-build/issues/3693 + // Assert.Equal(expectedSdkVersion, sdkVersion); } finally {