diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a881c8ef5..15bb3e97f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,41 +5,41 @@ 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 - 5a1d42b2a2219f560ad00e641d091339cc32f5fa + e856cdde17d1462592ee96ebac7dbaa7d1763ba1 - + https://github.com/dotnet/windowsdesktop - 5a1d42b2a2219f560ad00e641d091339cc32f5fa + e856cdde17d1462592ee96ebac7dbaa7d1763ba1 - + https://github.com/dotnet/windowsdesktop - 5a1d42b2a2219f560ad00e641d091339cc32f5fa + e856cdde17d1462592ee96ebac7dbaa7d1763ba1 - + https://github.com/dotnet/windowsdesktop - 5a1d42b2a2219f560ad00e641d091339cc32f5fa + e856cdde17d1462592ee96ebac7dbaa7d1763ba1 - + https://github.com/dotnet/runtime - ad25468103550b322351efb21a45fb54566a8127 + 2756c94062959522adbc84ee895c15866a7c9281 - + https://github.com/dotnet/runtime - ad25468103550b322351efb21a45fb54566a8127 + 2756c94062959522adbc84ee895c15866a7c9281 - + https://github.com/dotnet/runtime - ad25468103550b322351efb21a45fb54566a8127 + 2756c94062959522adbc84ee895c15866a7c9281 - + https://github.com/dotnet/runtime - ad25468103550b322351efb21a45fb54566a8127 + 2756c94062959522adbc84ee895c15866a7c9281 - + https://github.com/dotnet/runtime - ad25468103550b322351efb21a45fb54566a8127 + 2756c94062959522adbc84ee895c15866a7c9281 @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ad25468103550b322351efb21a45fb54566a8127 + 2756c94062959522adbc84ee895c15866a7c9281 - + https://github.com/dotnet/runtime - ad25468103550b322351efb21a45fb54566a8127 + 2756c94062959522adbc84ee895c15866a7c9281 - + https://github.com/dotnet/aspnetcore - d93b8e28b53f7c5d5cf6722facaef6012efa32b2 + 9dc43ee05cba5cad16f7ba56cb88711e7096bf84 - + https://github.com/dotnet/aspnetcore - d93b8e28b53f7c5d5cf6722facaef6012efa32b2 + 9dc43ee05cba5cad16f7ba56cb88711e7096bf84 - + https://github.com/dotnet/aspnetcore - d93b8e28b53f7c5d5cf6722facaef6012efa32b2 + 9dc43ee05cba5cad16f7ba56cb88711e7096bf84 - + https://github.com/dotnet/aspnetcore - d93b8e28b53f7c5d5cf6722facaef6012efa32b2 + 9dc43ee05cba5cad16f7ba56cb88711e7096bf84 - + https://github.com/dotnet/aspnetcore - d93b8e28b53f7c5d5cf6722facaef6012efa32b2 + 9dc43ee05cba5cad16f7ba56cb88711e7096bf84 - + https://github.com/dotnet/aspnetcore - d93b8e28b53f7c5d5cf6722facaef6012efa32b2 + 9dc43ee05cba5cad16f7ba56cb88711e7096bf84 - + https://github.com/dotnet/aspnetcore - d93b8e28b53f7c5d5cf6722facaef6012efa32b2 + 9dc43ee05cba5cad16f7ba56cb88711e7096bf84 - + https://github.com/dotnet/aspnetcore - d93b8e28b53f7c5d5cf6722facaef6012efa32b2 + 9dc43ee05cba5cad16f7ba56cb88711e7096bf84 - + https://github.com/dotnet/sdk - 766a3ef0a201c6229ffacb6bfe761f44730b632c + b9a63112a337ef929851f85512bb1ae000e7c40f - + https://github.com/dotnet/sdk - 766a3ef0a201c6229ffacb6bfe761f44730b632c + b9a63112a337ef929851f85512bb1ae000e7c40f - + https://github.com/dotnet/sdk - 766a3ef0a201c6229ffacb6bfe761f44730b632c + b9a63112a337ef929851f85512bb1ae000e7c40f - + https://github.com/dotnet/sdk - 766a3ef0a201c6229ffacb6bfe761f44730b632c + b9a63112a337ef929851f85512bb1ae000e7c40f - + https://github.com/dotnet/sdk - 766a3ef0a201c6229ffacb6bfe761f44730b632c + b9a63112a337ef929851f85512bb1ae000e7c40f @@ -129,71 +129,71 @@ https://github.com/dotnet/test-templates becc4bd157cd6608b51a5ffe414a5d2de6330272 - + https://github.com/dotnet/test-templates - 068b070bc5ce0add1328253d63f0f960f66a7e44 + 1591b24326caa98288e04e18e5c1b75c36c917c1 - + https://github.com/dotnet/test-templates - 068b070bc5ce0add1328253d63f0f960f66a7e44 + 1591b24326caa98288e04e18e5c1b75c36c917c1 - + https://github.com/dotnet/test-templates - 068b070bc5ce0add1328253d63f0f960f66a7e44 + 1591b24326caa98288e04e18e5c1b75c36c917c1 - + https://github.com/dotnet/winforms - 91f648b25dc18e9b7527714118a9e8f7e2b7075a + 852f7ef241402c2336e085c82dca6f70b7400c21 - + https://github.com/dotnet/wpf - 73e2313d6c6c861e64fc990d4f755e7aee3e8bba + 1b673503bc443f8272c50c4c14493fadb08a376f - + https://github.com/dotnet/fsharp - 5e40303518d76a13e9ace08190adb9243ba6ed56 + e74bc18e6411ce3a6265aabd36ae6491ee4ebf5c - + https://github.com/dotnet/fsharp - 5e40303518d76a13e9ace08190adb9243ba6ed56 + e74bc18e6411ce3a6265aabd36ae6491ee4ebf5c - + https://github.com/microsoft/vstest - 5eed35d4a9a2e1b688eb86c5e4171e370a561b2a + c13b1f9b2bb6acbb9785de003be3d9ace33c9d7c - + https://github.com/microsoft/vstest - 5eed35d4a9a2e1b688eb86c5e4171e370a561b2a + c13b1f9b2bb6acbb9785de003be3d9ace33c9d7c - + https://github.com/dotnet/runtime - ad25468103550b322351efb21a45fb54566a8127 + 2756c94062959522adbc84ee895c15866a7c9281 - + https://github.com/dotnet/roslyn - 744a0ae8691c5c463f63e9936b7d56592c0ed57c + 25aa74d725e801b8232dbb3e5abcda0fa72da8c5 - + https://github.com/dotnet/roslyn - 744a0ae8691c5c463f63e9936b7d56592c0ed57c + 25aa74d725e801b8232dbb3e5abcda0fa72da8c5 - + https://github.com/dotnet/msbuild - 15f7ddcaafa6622447fa69c1785ab7b3d1183719 + 53c4f49868e88ecd7407339a3f4dab9e75c7937f - + https://github.com/dotnet/msbuild - 15f7ddcaafa6622447fa69c1785ab7b3d1183719 + 53c4f49868e88ecd7407339a3f4dab9e75c7937f @@ -205,24 +205,24 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 4106737f31432e0408d3afd95bf242233daf48a6 + 8afd92448d03a80001c9cac5f2acb53b336263a4 - + https://github.com/dotnet/emsdk - 4106737f31432e0408d3afd95bf242233daf48a6 + 8afd92448d03a80001c9cac5f2acb53b336263a4 - + https://github.com/dotnet/deployment-tools - d260974045322b57853c0b1625123cf92b330574 + 822ff266c5f999ab9ceb6928df59d79285ea4a4f - + https://github.com/dotnet/deployment-tools - d260974045322b57853c0b1625123cf92b330574 + 822ff266c5f999ab9ceb6928df59d79285ea4a4f @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d5b02a4900c4d521cb48b8f0d7e3f28175268f7c - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d5b02a4900c4d521cb48b8f0d7e3f28175268f7c - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d5b02a4900c4d521cb48b8f0d7e3f28175268f7c https://github.com/dotnet/arcade-services @@ -263,23 +263,23 @@ https://github.com/dotnet/arcade-services c041bcdab75f5447be8bd11ddcfbe8e639f13f32 - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d5b02a4900c4d521cb48b8f0d7e3f28175268f7c - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d5b02a4900c4d521cb48b8f0d7e3f28175268f7c https://github.com/dotnet/runtime ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/source-build-reference-packages - 2f79f97b7a6a0cf2ca3297a8fa526e6f4ea98ce2 + 539af5d8ae183d4fe61e8b2f8f4a8505c8a765a7 @@ -299,14 +299,14 @@ aren't shipping, or those extensions packages depend on aspnetcore packages that won't ship. However, given the cost of maintaining this coherency path is high. This being toolset means that aspire is responsible for its own coherency. --> - + https://github.com/dotnet/aspire - 8ec92cbc5fbcba7a677fb52aaa4b0118f1ed17f4 + 1dd4b3265f01a50b20522fd3d7f3cd315db5be6b - + https://github.com/dotnet/aspire - 8ec92cbc5fbcba7a677fb52aaa4b0118f1ed17f4 + 1dd4b3265f01a50b20522fd3d7f3cd315db5be6b diff --git a/eng/Versions.props b/eng/Versions.props index 0bd6a09ed..a08b3f6d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,6 +9,10 @@ 0 1 00 + + $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) @@ -40,7 +44,7 @@ - 9.0.0-beta.24112.1 + 9.0.0-beta.24114.1 @@ -48,11 +52,11 @@ - 9.0.0-preview.2.24112.7 + 9.0.0-preview.2.24118.1 - 9.0.0-preview.2.24112.4 + 9.0.0-preview.2.24119.1 @@ -64,8 +68,8 @@ 1.1.0-rc.24069.1 1.1.0-rc.24069.1 - 1.1.0-rc.24112.1 - 1.1.0-rc.24112.1 + 1.1.0-rc.24120.2 + 1.1.0-rc.24120.2 @@ -73,49 +77,49 @@ - 9.0.0-preview.2.24113.8 - 9.0.0-preview.2.24113.8 - 9.0.0-preview.2.24113.8 - 9.0.0-preview.2.24113.8 - 9.0.0-preview.2.24113.8 - 9.0.0-preview.2.24113.8 - 9.0.0-preview.2.24113.8 + 9.0.0-preview.2.24120.1 + 9.0.0-preview.2.24120.1 + 9.0.0-preview.2.24120.1 + 9.0.0-preview.2.24120.1 + 9.0.0-preview.2.24120.1 + 9.0.0-preview.2.24120.1 + 9.0.0-preview.2.24120.1 0.2.0 - 9.0.100-preview.2.24114.11 - 9.0.100-preview.2.24114.11 - 9.0.100-preview.2.24114.11 + 9.0.100-preview.2.24120.13 + 9.0.100-preview.2.24120.13 + 9.0.100-preview.2.24120.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24114.1 + 4.10.0-2.24120.1 - 9.0.0-preview.2.24114.1 + 9.0.0-preview.2.24120.8 - 9.0.0-preview.2.24114.1 - 9.0.0-preview.2.24114.1 - 9.0.0-preview.2.24114.1 - 9.0.0-preview.2.24114.1 - 9.0.0-preview.2.24114.1 + 9.0.0-preview.2.24120.8 + 9.0.0-preview.2.24120.8 + 9.0.0-preview.2.24120.8 + 9.0.0-preview.2.24120.8 + 9.0.0-preview.2.24120.8 2.1.0 - 9.0.0-preview.2.24113.4 - 9.0.0-preview.2.24113.4 - 9.0.0-preview.2.24113.4 - 9.0.0-preview.2.24113.4 + 9.0.0-preview.2.24120.1 + 9.0.0-preview.2.24120.1 + 9.0.0-preview.2.24120.1 + 9.0.0-preview.2.24120.1 @@ -131,7 +135,7 @@ - 2.0.0-preview.1.24113.1 + 2.0.0-preview.1.24113.2 @@ -185,7 +189,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 @@ -245,23 +250,23 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24112-02 + 17.10.0-preview-24119-01 9.0.0-alpha.1.24058.10 9.0.0-preview.24057.2 9.0.100-preview.1 - 9.0.0-preview.1.24109.7 - 9.0.100-alpha.1 - 9.0.0-ci.net9.9818 - 34.99.0-preview.1.109 - 17.0.9712-net9-p1 - 17.0.9712-net9-p1 - 14.0.9712-net9-p1 - 17.0.9712-net9-p1 + 9.0.0-preview.1.24116.3 + 9.0.100-preview.1 + 9.0.0-preview.1.9973 + 34.99.0-preview.1.151 + 17.2.9088-net9-p1 + 17.2.9088-net9-p1 + 14.2.9088-net9-p1 + 17.2.9088-net9-p1 - 9.0.0-preview.2.24111.1 + 9.0.0-preview.2.24114.5 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 08605836a..e53063ee0 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -697,6 +697,18 @@ stages: targetOS: osx targetArchitecture: x64 + - template: ../jobs/vmr-build.yml + parameters: + buildName: OSX_Mono + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: + vmImage: ${{ variables.defaultPoolNameMac }} + useMonoRuntime: true + targetOS: osx + targetArchitecture: x64 + - template: ../jobs/vmr-build.yml parameters: buildName: Mariner_x64_Cross @@ -711,6 +723,21 @@ stages: targetOS: linux targetArchitecture: x64 + - template: ../jobs/vmr-build.yml + parameters: + buildName: Mariner_x64_Cross_Mono + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemandsLinux }} + container: ${{ variables.marinerX64CrossContainer }} + crossRootFs: '/crossrootfs/x64' + useMonoRuntime: true + targetOS: linux + targetArchitecture: x64 + # Mariner x64->non-x64 builds are currently broken, see https://github.com/dotnet/source-build/issues/3698 # - template: ../jobs/vmr-build.yml @@ -729,7 +756,7 @@ stages: - template: ../jobs/vmr-build.yml parameters: - buildName: OSX_x64_Cross + buildName: OSX isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: arm64 @@ -737,3 +764,65 @@ stages: vmImage: ${{ variables.defaultPoolNameMac }} targetOS: osx targetArchitecture: arm64 + + - template: ../jobs/vmr-build.yml + parameters: + buildName: OSX_Mono + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: arm64 + pool: + vmImage: ${{ variables.defaultPoolNameMac }} + useMonoRuntime: true + targetOS: osx + targetArchitecture: arm64 + + - template: ../jobs/vmr-build.yml + parameters: + buildName: Windows + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: arm64 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemandsWindows }} + targetOS: windows + targetArchitecture: arm64 + + - template: ../jobs/vmr-build.yml + parameters: + buildName: Windows_Mono + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemandsWindows }} + useMonoRuntime: true + targetOS: windows + targetArchitecture: x64 + + - template: ../jobs/vmr-build.yml + parameters: + buildName: Windows + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x86 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemandsWindows }} + targetOS: windows + targetArchitecture: x86 + + - template: ../jobs/vmr-build.yml + parameters: + buildName: Windows_Mono + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x86 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemandsWindows }} + useMonoRuntime: true + targetOS: windows + targetArchitecture: x86 diff --git a/eng/pipelines/vmr-build.yml b/eng/pipelines/vmr-build.yml index 45733f9d2..9303fd72f 100644 --- a/eng/pipelines/vmr-build.yml +++ b/eng/pipelines/vmr-build.yml @@ -55,7 +55,9 @@ stages: vmrBranch: ${{ variables.VmrBranch }} isBuiltFromVmr: false isSourceOnlyBuild: ${{ variables.isSourceOnlyBuild }} - ${{ if eq(variables.isSourceOnlyBuild, 'true') }}: + ${{ if contains(variables['Build.DefinitionName'], '-full') }}: + scope: full + ${{ elseif eq(variables.isSourceOnlyBuild, 'true') }}: scope: ultralite ${{ else }}: scope: lite diff --git a/global.json b/global.json index 6a9daba93..a44b984e2 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24112.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24112.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24114.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24114.1" } } diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 5cc142c57..bbd94253d 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -50,11 +50,12 @@ $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) $(BuildRid) - $(BuildRid) + $(BuildRid.Substring(0, $(BuildRid.LastIndexOf('-'))))-$(TargetArchitecture) - - true - false + + false + true $(__PortableTargetOS)-$(TargetArchitecture) freebsd-$(TargetArchitecture) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 6256d40a0..2bad689ac 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -36,7 +36,6 @@ - diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj index 5c232717e..541b3205d 100644 --- a/src/SourceBuild/content/repo-projects/installer.proj +++ b/src/SourceBuild/content/repo-projects/installer.proj @@ -21,6 +21,7 @@ $(BuildArgs) /p:OSName=$(OSNameOverride) $(BuildArgs) /p:PortableOSName=$(__PortableTargetOS) $(BuildArgs) /p:Rid=$(TargetRid) + $(BuildArgs) /p:Architecture=$(TargetArchitecture) $(BuildArgs) /p:DOTNET_INSTALL_DIR=$(DotNetRoot) $(BuildArgs) /p:AspNetCoreInstallerRid=$(TargetRid) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index 5b0f5d0e1..338c94dcd 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -62,61 +62,11 @@ msft,./sdk/x.y.z/Extensions/dump/* msft,./sdk/x.y.z/**/System.Windows.Extensions.dll msft,./sdk/x.y.z/**/System.Security.Permissions.dll -# netfx runtimes for dotnet-watch - https://github.com/dotnet/source-build/issues/3285 -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Elfie.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Win32.SystemEvents.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/* -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Configuration.ConfigurationManager.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Drawing.Common.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll - -# netfx runtimes for dotnet-watch - https://github.com/dotnet/source-build/issues/3999 -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-net472/* -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-netcore/System.Threading.Channels.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.VisualStudio.Setup.Configuration.Interop.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/* -sb,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Configuration.ConfigurationManager.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.IO.Pipelines.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll - -# netfx runtimes for dotnet-watch - https://github.com/dotnet/source-build/issues/4035 -sb,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-netcore/runtimes/* -sb,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-netcore/System.Text.Encodings.Web.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-netcore/System.Text.Json.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Extensions.DependencyInjection.Abstractions.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Extensions.Logging.Abstractions.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.Pkcs.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.Xml.dll - -# netfx runtimes for dotnet-format - https://github.com/dotnet/source-build/issues/3509 -msft,./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.Elfie.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/* - -# netfx runtimes for dotnet-format - https://github.com/dotnet/source-build/issues/3998 -msft,./sdk/x.y.z/DotnetTools/dotnet-format/BuildHost-net472/* -msft,./sdk/x.y.z/DotnetTools/dotnet-format/BuildHost-netcore/System.Threading.Channels.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Permissions.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-format/System.Windows.Extensions.dll - -# netfx runtimes for dotnet-format - https://github.com/dotnet/source-build/issues/4034 -sb,./sdk/x.y.z/DotnetTools/dotnet-format/BuildHost-netcore/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.deps.json -sb,./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/* -sb,./sdk/x.y.z/DotnetTools/dotnet-format/System.Collections.Immutable.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-format/System.Reflection.Metadata.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encodings.Web.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Json.dll - -# https://github.com/dotnet/source-build/issues/3922 -msft,./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.Win32.SystemEvents.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Drawing.Common.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-format/System.Diagnostics.EventLog.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-format/System.Formats.Asn1.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-format/System.Threading.Tasks.Dataflow.dll - -# version coherency issue in dotnet-format - https://github.com/dotnet/source-build/issues/4016#issuecomment-1908996093 -msft,./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.dll +# Exclude format and watch tools due to too much noise +msft,./sdk/x.y.z/DotnetTools/dotnet-format/** +sb,./sdk/x.y.z/DotnetTools/dotnet-format/** +msft,./sdk/x.y.z/DotnetTools/dotnet-watch/** +sb,./sdk/x.y.z/DotnetTools/dotnet-watch/** # netfx runtimes for fsharp - https://github.com/dotnet/source-build/issues/3290 msft,./sdk/x.y.z/FSharp/Microsoft.VisualStudio.Setup.Configuration.Interop.dll diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff index d02f4b5ee..d07075982 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff @@ -44,6 +44,14 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ +@@ ------------ @@ + ./sdk-manifests/x.y.z/ + ./sdk-manifests/x.y.z/ + ./sdk-manifests/x.y.z/ +-./sdk-manifests/x.y.z/ + ./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/ + ./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/x.y.z/ + ./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/x.y.z/WorkloadManifest.Aspire.targets @@ ------------ @@ ./sdk/x.y.z/Containers/build/ ./sdk/x.y.z/Containers/build/Microsoft.NET.Build.Containers.props diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index feb6ebf2e..efb1baa40 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -64,7 +64,8 @@ "name": "aspire", "defaultRemote": "https://github.com/dotnet/aspire", "exclude": [ - "src/Aspire.Dashboard/**/*" + "src/Aspire.Dashboard/**/*", + "samples/**/*" ] }, { diff --git a/src/finalizer/CMakeLists.txt b/src/finalizer/CMakeLists.txt index aac5c20b3..80c5be98d 100644 --- a/src/finalizer/CMakeLists.txt +++ b/src/finalizer/CMakeLists.txt @@ -55,6 +55,7 @@ target_link_libraries(Finalizer shell32.lib) target_link_libraries(Finalizer advapi32.lib) target_link_libraries(Finalizer version.lib) target_link_libraries(Finalizer msi.lib) +target_link_libraries(Finalizer shlwapi.lib) # Add WiX libraries target_link_libraries(Finalizer wcautil.lib) diff --git a/src/finalizer/finalizer.cpp b/src/finalizer/finalizer.cpp index d68418b9b..03a1213ba 100644 --- a/src/finalizer/finalizer.cpp +++ b/src/finalizer/finalizer.cpp @@ -492,12 +492,64 @@ LExit: return hr; } +void RemoveInstallStateFile(LPWSTR sczSdkFeatureBandVersion, LPWSTR sczPlatform) +{ + HRESULT hr = S_OK; + LPWSTR sczProgramData = NULL; + LPWSTR sczInstallStatePath = NULL; + LPWSTR sczPath = NULL; + + hr = ShelGetFolder(&sczProgramData, CSIDL_COMMON_APPDATA); + ExitOnFailure(hr, "Failed to get shell folder."); + + hr = PathConcat(sczProgramData, L"dotnet", &sczInstallStatePath); + ExitOnFailure(hr, "Failed to concat dotnet to install state path."); + + hr = PathConcat(sczInstallStatePath, L"workloads", &sczInstallStatePath); + ExitOnFailure(hr, "Failed to concat workloads to install state path."); + + hr = PathConcat(sczInstallStatePath, sczPlatform, &sczInstallStatePath); + ExitOnFailure(hr, "Failed to concat platform (%ls) to install state path.", sczPlatform); + + hr = PathConcat(sczInstallStatePath, sczSdkFeatureBandVersion, &sczInstallStatePath); + ExitOnFailure(hr, "Failed to concat feature band (%ls) to install state path.", sczSdkFeatureBandVersion); + + hr = PathConcat(sczInstallStatePath, L"installstate", &sczInstallStatePath); + ExitOnFailure(hr, "Failed to concat installstate to install state path."); + + hr = PathConcat(sczInstallStatePath, L"default.json", &sczInstallStatePath); + ExitOnFailure(hr, "Failed to concat default.json to install state path."); + + if (FileExistsEx(sczInstallStatePath, NULL)) + { + LogStringLine(REPORT_STANDARD, "Deleting install state file: %ls", sczInstallStatePath); + hr = FileEnsureDelete(sczInstallStatePath); + ExitOnFailure(hr, "Failed to delete install state file: %ls", sczInstallStatePath); + + hr = PathGetParentPath(sczInstallStatePath, &sczPath); + ExitOnFailure(hr, "Failed to get parent path of install state file."); + + LogStringLine(REPORT_STANDARD, "Cleaning up empty workload folders."); + DirDeleteEmptyDirectoriesToRoot(sczPath, 0); + } + else + { + LogStringLine(REPORT_STANDARD, "Install state file does not exist: %ls", sczInstallStatePath); + } + +LExit: + ReleaseStr(sczPath); + ReleaseStr(sczInstallStatePath) + ReleaseStr(sczProgramData); +} + int wmain(int argc, wchar_t* argv[]) { HRESULT hr = S_OK; DWORD dwExitCode = 0; LPWSTR sczDependent = NULL; LPWSTR sczFeatureBandVersion = NULL; + LPWSTR sczPlatform = NULL; BOOL bRestartRequired = FALSE; BOOL bSdkFeatureBandInstalled = FALSE; int iMajor = 0; @@ -507,16 +559,19 @@ int wmain(int argc, wchar_t* argv[]) hr = ::Initialize(argc, argv); ExitOnFailure(hr, "Failed to initialize."); + hr = StrAllocString(&sczPlatform, argv[3], 0); + ExitOnFailure(hr, "Failed to copy platform argument."); + // Convert the full SDK version to a feature band version hr = ParseSdkVersion(argv[2], &sczFeatureBandVersion); ExitOnFailure(hr, "Failed to parse version, %ls.", argv[2]); // Create the dependent value, e.g., Microsoft.NET.Sdk,6.0.300,arm64 - hr = StrAllocFormatted(&sczDependent, L"Microsoft.NET.Sdk,%ls,%ls", sczFeatureBandVersion, argv[3]); + hr = StrAllocFormatted(&sczDependent, L"Microsoft.NET.Sdk,%ls,%ls", sczFeatureBandVersion, sczPlatform); ExitOnFailure(hr, "Failed to create dependent."); LogStringLine(REPORT_STANDARD, "Setting target dependent to %ls.", sczDependent); - hr = ::DetectSdk(sczFeatureBandVersion, argv[3], &bSdkFeatureBandInstalled); + hr = ::DetectSdk(sczFeatureBandVersion, sczPlatform, &bSdkFeatureBandInstalled); ExitOnFailure(hr, "Failed to detect installed SDKs."); // If the feature band is still present, do not remove workloads. @@ -529,7 +584,7 @@ int wmain(int argc, wchar_t* argv[]) hr = ::RemoveDependent(sczDependent, &bRestartRequired); ExitOnFailure(hr, "Failed to remove dependent \"%ls\".", sczDependent); - hr = ::DeleteWorkloadRecords(sczFeatureBandVersion, argv[3]); + hr = ::DeleteWorkloadRecords(sczFeatureBandVersion, sczPlatform); ExitOnFailure(hr, "Failed to remove workload records."); if (bRestartRequired) @@ -537,9 +592,12 @@ int wmain(int argc, wchar_t* argv[]) dwExitCode = ERROR_SUCCESS_REBOOT_REQUIRED; } + RemoveInstallStateFile(sczFeatureBandVersion, sczPlatform); + LExit: ReleaseStr(sczDependent); ReleaseStr(sczFeatureBandVersion); + ReleaseStr(sczPlatform); LogUninitialize(TRUE); RegUninitialize(); WiuUninitialize(); diff --git a/src/finalizer/precomp.h b/src/finalizer/precomp.h index 1a6cd5df0..97bc60b13 100644 --- a/src/finalizer/precomp.h +++ b/src/finalizer/precomp.h @@ -12,6 +12,8 @@ #include #include #include +#include +#include // Configure some logging parameters for WiX #define ExitTrace LogErrorString @@ -26,3 +28,7 @@ #include "pathutil.h" #include "strutil.h" #include "wiutil.h" +#include "dirutil.h" +#include "fileutil.h" +#include "shelutil.h" + diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548..e6cd301f7 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index e4e8a29ce..6c5a7a912 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -362,8 +362,6 @@ win-x64; " /> - - + + + + $(_NETCorePlatformsPackageVersion) %24(MSBuildThisFileDirectory)RuntimeIdentifierGraph.json $(Version) + $(SdkFeatureBand) $(ProductMonikerRid) $(PortableProductMonikerRid) <_NETCoreSdkIsPreview>$(_NETCoreSdkBeingBuiltIsPreview) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 8ef9e81b7..4542d9998 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -475,7 +475,7 @@ diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 5acc61c19..41d2c7820 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -3,7 +3,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 058f4cf7a..9c7f538aa 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -213,6 +213,10 @@ $(TestArgs) -testList SdkIntegrationTests + + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipStableSDK.xml" + diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 245dd40e7..f5b3aa523 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -45,10 +45,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Issue="https://github.com/dotnet/sdk/pull/3574" + Reason="Requires the 1.1 runtime, renenable when removed"/> diff --git a/test/SdkTests/TestsToSkipLinux.xml b/test/SdkTests/TestsToSkipLinux.xml index b2bfd698a..adc3dcbc5 100644 --- a/test/SdkTests/TestsToSkipLinux.xml +++ b/test/SdkTests/TestsToSkipLinux.xml @@ -6,5 +6,13 @@ + + diff --git a/test/SdkTests/TestsToSkipStableSDK.xml b/test/SdkTests/TestsToSkipStableSDK.xml new file mode 100644 index 000000000..550025aa6 --- /dev/null +++ b/test/SdkTests/TestsToSkipStableSDK.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +