diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 142ec9e05..d5f267764 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 59ce4201f5bc3ce19dc6d7b47b331b70499c3ade + 2541dffa7cfd8e179f54ff4341fb07d910c301ac - + https://github.com/dotnet/windowsdesktop - 59ce4201f5bc3ce19dc6d7b47b331b70499c3ade + 2541dffa7cfd8e179f54ff4341fb07d910c301ac - + https://github.com/dotnet/windowsdesktop - 59ce4201f5bc3ce19dc6d7b47b331b70499c3ade + 2541dffa7cfd8e179f54ff4341fb07d910c301ac - + https://github.com/dotnet/windowsdesktop - 59ce4201f5bc3ce19dc6d7b47b331b70499c3ade + 2541dffa7cfd8e179f54ff4341fb07d910c301ac - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + bad2ab053c53f68a9b7b8ed7d0867fc58261bc9a - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + bad2ab053c53f68a9b7b8ed7d0867fc58261bc9a - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + bad2ab053c53f68a9b7b8ed7d0867fc58261bc9a - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + bad2ab053c53f68a9b7b8ed7d0867fc58261bc9a - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + bad2ab053c53f68a9b7b8ed7d0867fc58261bc9a - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + bad2ab053c53f68a9b7b8ed7d0867fc58261bc9a @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + bad2ab053c53f68a9b7b8ed7d0867fc58261bc9a - + https://github.com/dotnet/aspnetcore - 67d0c9fd4ebd0dafea4847b9637c1c86ec3b2890 + b806844373440a538192181652d466b621a14494 - + https://github.com/dotnet/aspnetcore - 67d0c9fd4ebd0dafea4847b9637c1c86ec3b2890 + b806844373440a538192181652d466b621a14494 - + https://github.com/dotnet/aspnetcore - 67d0c9fd4ebd0dafea4847b9637c1c86ec3b2890 + b806844373440a538192181652d466b621a14494 - + https://github.com/dotnet/aspnetcore - 67d0c9fd4ebd0dafea4847b9637c1c86ec3b2890 + b806844373440a538192181652d466b621a14494 - + https://github.com/dotnet/aspnetcore - 67d0c9fd4ebd0dafea4847b9637c1c86ec3b2890 + b806844373440a538192181652d466b621a14494 - + https://github.com/dotnet/aspnetcore - 67d0c9fd4ebd0dafea4847b9637c1c86ec3b2890 + b806844373440a538192181652d466b621a14494 https://github.com/dotnet/test-templates @@ -94,45 +94,45 @@ b3ea6fe79f36182991222dbf5bb18ee13800a657 - + https://github.com/dotnet/templating - ffb0930f86aebca016252d024c13f4e57f6697df + c988d74e251a9e04272b671aedaccd12eb527291 - + https://github.com/dotnet/templating - ffb0930f86aebca016252d024c13f4e57f6697df + c988d74e251a9e04272b671aedaccd12eb527291 - + https://github.com/dotnet/sdk - ae415f34f24991a59a6a37f3a70bc2556f1ba20d + 76f96caa91488298268576ac1ca6634d665ee04e - + https://github.com/dotnet/sdk - ae415f34f24991a59a6a37f3a70bc2556f1ba20d + 76f96caa91488298268576ac1ca6634d665ee04e - + https://github.com/dotnet/winforms - a7c147277cd16b6932aa2dff90af778a28e52db8 + 5427959215dfc57d4ecf082ba5f65dc597e2c2b9 - + https://github.com/dotnet/wpf - d4ffc346269d503c6871bca895b7d59675e7ce5d + 42a8bbe349253e71d53e0d24ec18363dcb20655d - + https://github.com/dotnet/fsharp - 058e7a7e597a02c129f38742f250a4b212da9ee3 + 211fd760c2315d73cfa0d375fe64abb346bc1096 - + https://github.com/dotnet/fsharp - 058e7a7e597a02c129f38742f250a4b212da9ee3 + 211fd760c2315d73cfa0d375fe64abb346bc1096 - + https://github.com/microsoft/vstest - c5ee800d6a1bcfc8739e74b16d232ecc431064ac + e73936f02c0125fc028549d19278caad90bbe56a @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - 038b1a9de7cf82a66c8e57fc3262454beadbbabc + 96beab67e4899a615b401a0803f076697dc747b2 - + https://github.com/dotnet/msbuild - 78bb45f0f7033ba5658903dacd6164e83af68c94 + a2df02e6af1ed33882f36932ac2111cc98591dff @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - aeb9a3591b687c3f141e43b330604b34da738149 + dca71051151e0515887671938196f3b87ad1c19f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index fd7c61b5f..f72c294bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-preview.4.22268.5 + 7.0.0-preview.6.22303.2 - 7.0.0-preview.5.22269.1 + 7.0.0-preview.6.22303.3 - 7.0.100-preview.5.22273.5 + 7.0.100-preview.6.22302.3 @@ -52,44 +52,44 @@ - 7.0.0-preview.5.22273.7 - 7.0.0-preview.5.22273.7 - 7.0.0-preview.5.22273.7 - 7.0.0-preview.5.22273.7 - 7.0.0-preview.5.22273.7 - 7.0.0-preview.5.22273.7 + 7.0.0-preview.6.22303.7 + 7.0.0-preview.6.22303.7 + 7.0.0-preview.6.22303.7 + 7.0.0-preview.6.22303.7 + 7.0.0-preview.6.22303.7 + 7.0.0-preview.6.22303.7 0.2.0 - 7.0.100-preview.5.22273.27 - 7.0.100-preview.5.22273.27 + 7.0.100-preview.6.22305.1 + 7.0.100-preview.6.22305.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-preview.5.22272.3 + 7.0.0-preview.6.22304.5 - 7.0.0-preview.5.22272.3 - 7.0.0-preview.5.22272.3 - 7.0.0-preview.5.22272.3 - 7.0.0-preview.5.22272.3 - 7.0.0-preview.5.22272.3 - 7.0.0-preview.5.22272.3 + 7.0.0-preview.6.22304.5 + 7.0.0-preview.6.22304.5 + 7.0.0-preview.6.22304.5 + 7.0.0-preview.6.22304.5 + 7.0.0-preview.6.22304.5 + 7.0.0-preview.6.22304.5 2.1.0 - 7.0.0-preview.5.22269.1 - 7.0.0-preview.5.22269.1 - 7.0.0-preview.5.22269.1 - 7.0.0-preview.5.22269.1 + 7.0.0-preview.6.22303.4 + 7.0.0-preview.6.22303.4 + 7.0.0-preview.6.22303.4 + 7.0.0-preview.6.22303.4 @@ -167,7 +167,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220520-02 + 17.3.0-preview-20220603-06 @@ -200,7 +200,7 @@ 12.3.303 15.4.303 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-preview.5.22252.1 + 7.0.0-preview.5.22268.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index f014d0fa4..d3d3ee284 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -88,3 +88,5 @@ jobs: # fi displayName: Tarball Build Check name: Tarball_Build_Check + # Disable tarball CI for 7.0 Preview 5 since source-build in not fully supported. + condition: false \ No newline at end of file diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Temporarily-patch-out-native-sourcelink-file-check-i.patch b/src/SourceBuild/tarball/patches/runtime/0001-Temporarily-patch-out-native-sourcelink-file-check-i.patch new file mode 100644 index 000000000..331cde7bc --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0001-Temporarily-patch-out-native-sourcelink-file-check-i.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 1 Jun 2022 10:10:01 -0500 +Subject: [PATCH] Temporarily patch out native sourcelink file check in + source-build. This returns source-build to its old behavior. + https://github.com/dotnet/source-build/issues/2883 tracks the follow-up to + confirm a proper fix. + +--- + src/coreclr/runtime-prereqs.proj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/coreclr/runtime-prereqs.proj b/src/coreclr/runtime-prereqs.proj +index 5d660044a09..b2abc4415a6 100644 +--- a/src/coreclr/runtime-prereqs.proj ++++ b/src/coreclr/runtime-prereqs.proj +@@ -6,7 +6,7 @@ + $(ArtifactsObjDir)runtime_version.h + $(ArtifactsObjDir)native.sourcelink.json + false +- true ++ true + .NET Runtime + +