diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b67e413bc..3b79e7de4 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 - 2cc342a803fb933793ea3d67d4c5fdd150a64533 + 0c003a14ab4baa5f5bf256575ae94f4fd88b45b7 - + https://github.com/dotnet/windowsdesktop - 2cc342a803fb933793ea3d67d4c5fdd150a64533 + 0c003a14ab4baa5f5bf256575ae94f4fd88b45b7 - + https://github.com/dotnet/windowsdesktop - 2cc342a803fb933793ea3d67d4c5fdd150a64533 + 0c003a14ab4baa5f5bf256575ae94f4fd88b45b7 - + https://github.com/dotnet/windowsdesktop - 2cc342a803fb933793ea3d67d4c5fdd150a64533 + 0c003a14ab4baa5f5bf256575ae94f4fd88b45b7 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/sdk - 9d732b9cf69896f944a238670eed7edf41127af4 + 9e5ed21803179f9bfa4dd179c621f9d7bd4f2104 - + https://github.com/dotnet/sdk - 9d732b9cf69896f944a238670eed7edf41127af4 + 9e5ed21803179f9bfa4dd179c621f9d7bd4f2104 - + https://github.com/dotnet/sdk - 9d732b9cf69896f944a238670eed7edf41127af4 + 9e5ed21803179f9bfa4dd179c621f9d7bd4f2104 - + https://github.com/dotnet/sdk - 9d732b9cf69896f944a238670eed7edf41127af4 + 9e5ed21803179f9bfa4dd179c621f9d7bd4f2104 https://github.com/dotnet/test-templates @@ -124,65 +124,65 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - 1bd0529d3697f0306ea49be0e26f74fb20d0b069 + 4eae6075b679fb57727d7bee8a6eefd5929aec03 - + https://github.com/dotnet/wpf - dabde7a9730980eb455ae014573aff73de337729 + 026f338641b847dace824f36376beae5f5ad021a - + https://github.com/dotnet/fsharp - d55c3ef1b3dc620a5b6e4ad061633139f06ee44e + f3f18c65e6f2bfb42d1f4fb154678fbf7265f4f0 - + https://github.com/dotnet/fsharp - d55c3ef1b3dc620a5b6e4ad061633139f06ee44e + f3f18c65e6f2bfb42d1f4fb154678fbf7265f4f0 - + https://github.com/microsoft/vstest - f60b983c0fd2eb2974938b5ea3ba15529ed99d14 + d21ac0a0dfe6360fab8d9f4003003d41daa26ebb - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/roslyn - 299843030dd6eb08888875285791de0c00893a99 + 51e650881144535940dd6502cd3b34382b5c5cc8 - + https://github.com/dotnet/msbuild - b3989dc43a984b7fbeffb7881ae5bfc9cc793126 + 0cf89d3b27af71d0e065e4c69ee030cfe26b90c5 - + https://github.com/nuget/nuget.client - 84ba85d08b27afaa38ad4ae4e7e1684c74e9567c + c94490d7af33f4198ed552787623cf9227996006 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 3a52d07cd6a500d81d9cee79cbc8f0b9a90e1dbf + abfa03c97f4175d4d209435cd0e71f558e36c3fd - + https://github.com/dotnet/deployment-tools - 9e870996b8bf0b91a791edd1039bfd23bdd01af8 + 850f61abed37b617a41fd59b63a37c284af6801d - + https://github.com/dotnet/deployment-tools - 9e870996b8bf0b91a791edd1039bfd23bdd01af8 + 850f61abed37b617a41fd59b63a37c284af6801d diff --git a/eng/Versions.props b/eng/Versions.props index efccd7e4a..48ae0868d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.0-rc.1.23380.1 + 8.0.0-rc.1.23411.1 - 8.0.0-rc.1.23380.1 + 8.0.0-rc.1.23412.1 @@ -71,50 +71,50 @@ - 8.0.0-rc.1.23401.1 - 8.0.0-rc.1.23401.1 - 8.0.0-rc.1.23401.1 - 8.0.0-rc.1.23401.1 - 8.0.0-rc.1.23401.1 - 8.0.0-rc.1.23401.1 - 8.0.0-rc.1.23401.1 + 8.0.0-rc.1.23414.10 + 8.0.0-rc.1.23414.10 + 8.0.0-rc.1.23414.10 + 8.0.0-rc.1.23414.10 + 8.0.0-rc.1.23414.10 + 8.0.0-rc.1.23414.10 + 8.0.0-rc.1.23414.10 0.2.0 - 8.0.100-rc.1.23401.23 - 8.0.100-rc.1.23401.23 - 8.0.100-rc.1.23401.23 + 8.0.100-rc.1.23414.10 + 8.0.100-rc.1.23414.10 + 8.0.100-rc.1.23414.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-1.23401.1 + 4.8.0-1.23414.4 - 8.0.0-rc.1.23381.3 + 8.0.0-rc.1.23414.4 - 8.0.0-rc.1.23381.3 - 8.0.0-rc.1.23381.3 - 8.0.0-rc.1.23381.3 - 8.0.0-rc.1.23381.3 - 8.0.0-rc.1.23381.3 - 8.0.0-rc.1.23381.3 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 2.1.0 - 8.0.0-rc.1.23381.1 - 8.0.0-rc.1.23381.1 - 8.0.0-rc.1.23381.1 - 8.0.0-rc.1.23381.1 + 8.0.0-rc.1.23412.3 + 8.0.0-rc.1.23412.3 + 8.0.0-rc.1.23412.3 + 8.0.0-rc.1.23412.3 @@ -126,11 +126,11 @@ - 6.8.0-preview.1.49 + 6.8.0-preview.1.60 - 1.0.0-preview.6.23206.1 + 1.0.0-preview.6.23407.1 @@ -231,7 +231,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-preview-23381-02 + 17.8.0-preview-23407-02 8.0.0-alpha.1.22557.12 @@ -244,7 +244,7 @@ 13.3.8646-net8-p6 16.4.8646-net8-p6 - 8.0.0-rc.1.23377.1 + 8.0.0-rc.1.23411.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index fefd8df7a..f0e045b07 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.7.23376.1.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.7.23376.1-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rc.1.23410.1.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-rc.1.23410.1-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 427138f99..a29dc5cc6 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.7.23376.3" + "dotnet": "8.0.100-rc.1.23410.12" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs index 5767955ac..cb008eccc 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs @@ -34,7 +34,8 @@ public class BasicScenarioTests : SmokeTests { yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.Console, // R2R is not supported on Mono (see https://github.com/dotnet/runtime/issues/88419#issuecomment-1623762676) - DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex | (helper.IsMonoRuntime ? DotNetActions.None : DotNetActions.PublishR2R)); + // Disable R2R tests due to https://github.com/dotnet/source-build/issues/3591 + DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex); yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.ClassLib, DotNetActions.Build | DotNetActions.Publish); yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.XUnit, DotNetActions.Test); yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.NUnit, DotNetActions.Test); diff --git a/src/SourceBuild/patches/deployment-tools/0001-Disable-trimmable-for-DotNet.Releases-project.patch b/src/SourceBuild/patches/deployment-tools/0001-Disable-trimmable-for-DotNet.Releases-project.patch new file mode 100644 index 000000000..f8a5bc0de --- /dev/null +++ b/src/SourceBuild/patches/deployment-tools/0001-Disable-trimmable-for-DotNet.Releases-project.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Fri, 11 Aug 2023 12:03:41 -0500 +Subject: [PATCH] Disable trimmable for DotNet.Releases project + +Backport: https://github.com/dotnet/deployment-tools/issues/288 +--- + .../src/Microsoft.Deployment.DotNet.Releases.csproj | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj b/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj +index ee19600..2e50a3a 100644 +--- a/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj ++++ b/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj +@@ -5,8 +5,8 @@ + 0 + 6 + true +- true +- true ++ false ++ false + + + diff --git a/src/SourceBuild/patches/deployment-tools/0001-Remove-sourcelink-dependencies.patch b/src/SourceBuild/patches/deployment-tools/0001-Remove-sourcelink-dependencies.patch deleted file mode 100644 index a9709002e..000000000 --- a/src/SourceBuild/patches/deployment-tools/0001-Remove-sourcelink-dependencies.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Thu, 20 Jul 2023 21:02:57 +0000 -Subject: [PATCH] Remove sourcelink dependencies - -Backport: https://github.com/dotnet/deployment-tools/issues/282 ---- - eng/Tools.props | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/eng/Tools.props b/eng/Tools.props -index e0c3314..c0569e2 100644 ---- a/eng/Tools.props -+++ b/eng/Tools.props -@@ -5,10 +5,4 @@ - <_RepoToolManifest Condition="'$(ContinuousIntegrationBuild)' == 'true'" /> - - -- -- -- -- -- -- - diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 8d1384e3f..9fd750ded 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -408,7 +408,7 @@ namespace EndToEnd.Tests { string framework = DetectExpectedDefaultFramework(templateName); - if (RuntimeInformation.RuntimeIdentifier.StartsWith("alpine")) //linux musl + if (RuntimeInformation.RuntimeIdentifier.StartsWith("linux-musl")) { TestTemplateCreateAndBuild(templateName, build: false, framework: framework); }