diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 655c9d190fe5..429c53be0639 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -121,7 +121,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' buildConfiguration: Debug buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' @@ -222,7 +222,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' buildConfiguration: Release buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' diff --git a/Directory.Build.props b/Directory.Build.props index 5d0198439fae..c40c8555e1a2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,7 +8,7 @@ - $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) + $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) $(BuildArchitecture) $(BuildArchitecture) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index c1341c290a5e..9e4078adfb53 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -8,11 +8,25 @@ - + $(InnerBuildArgs) /p:SkipBuildingInstallers=true $(InnerBuildArgs) /p:IncludeAdditionalSharedFrameworks=false $(InnerBuildArgs) /p:DISABLE_CROSSGEN=true + $(InnerBuildArgs) /p:PgoInstrument=true + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67820ea449e4..ffb771de0f96 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 - 5bee3d319e61624015f18b0a4d282fd474e9c9b4 + 6cd8a235fa93f02ae0400a78625dab312c4642f2 - + https://github.com/dotnet/windowsdesktop - 5bee3d319e61624015f18b0a4d282fd474e9c9b4 + 6cd8a235fa93f02ae0400a78625dab312c4642f2 - + https://github.com/dotnet/windowsdesktop - 5bee3d319e61624015f18b0a4d282fd474e9c9b4 + 6cd8a235fa93f02ae0400a78625dab312c4642f2 - + https://github.com/dotnet/windowsdesktop - 5bee3d319e61624015f18b0a4d282fd474e9c9b4 + 6cd8a235fa93f02ae0400a78625dab312c4642f2 - + https://github.com/dotnet/runtime - 963626276e11bf5587aaed69826b62682b05d9c4 + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/runtime - 963626276e11bf5587aaed69826b62682b05d9c4 + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/runtime - 963626276e11bf5587aaed69826b62682b05d9c4 + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/runtime - 963626276e11bf5587aaed69826b62682b05d9c4 + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/runtime - 963626276e11bf5587aaed69826b62682b05d9c4 + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 963626276e11bf5587aaed69826b62682b05d9c4 + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/runtime - 963626276e11bf5587aaed69826b62682b05d9c4 + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/aspnetcore - 4ea9f39a3447596ed9bf42320882cc6423e0c60b + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - 4ea9f39a3447596ed9bf42320882cc6423e0c60b + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - 4ea9f39a3447596ed9bf42320882cc6423e0c60b + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - 4ea9f39a3447596ed9bf42320882cc6423e0c60b + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - 4ea9f39a3447596ed9bf42320882cc6423e0c60b + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - 4ea9f39a3447596ed9bf42320882cc6423e0c60b + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - 4ea9f39a3447596ed9bf42320882cc6423e0c60b + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - 4ea9f39a3447596ed9bf42320882cc6423e0c60b + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/sdk - 734ad688cde2fe21c00de4961b57201b34c57b34 + e0a3cd9377fb9decba91d8cbcd50f2fe6107b12c - + https://github.com/dotnet/sdk - 734ad688cde2fe21c00de4961b57201b34c57b34 + e0a3cd9377fb9decba91d8cbcd50f2fe6107b12c - + https://github.com/dotnet/sdk - 734ad688cde2fe21c00de4961b57201b34c57b34 + e0a3cd9377fb9decba91d8cbcd50f2fe6107b12c - + https://github.com/dotnet/sdk - 734ad688cde2fe21c00de4961b57201b34c57b34 + e0a3cd9377fb9decba91d8cbcd50f2fe6107b12c - + https://github.com/dotnet/sdk - 734ad688cde2fe21c00de4961b57201b34c57b34 + e0a3cd9377fb9decba91d8cbcd50f2fe6107b12c @@ -129,100 +129,100 @@ 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 - fad8ead656f72043b67ae5aa2f983ad448daa00d + 822e882f4080b6197234cd82ad0d2f2a485a4f35 - + https://github.com/dotnet/wpf - 06b815c6811987d20ba4682afe2bf4e8a8b5184c + a86dc342ee4a97a9d36c1e55503e5d7ae7eb8b80 - + https://github.com/dotnet/fsharp - 14ddb01cad17d7737028afdd90e36b85a1086626 + 02bb351b606468bce98688fccda9d0c8adcd964d - + https://github.com/dotnet/fsharp - 14ddb01cad17d7737028afdd90e36b85a1086626 + 02bb351b606468bce98688fccda9d0c8adcd964d - + https://github.com/microsoft/vstest - f6c1ca66f0e01c64d663a8780d501432b680d804 + 48d8e778c871315db0bad221b00f4843b06242c3 - + https://github.com/microsoft/vstest - f6c1ca66f0e01c64d663a8780d501432b680d804 + 48d8e778c871315db0bad221b00f4843b06242c3 - + https://github.com/dotnet/runtime - 963626276e11bf5587aaed69826b62682b05d9c4 + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/roslyn - 77372c66fd54927312b5b0a2e399e192f74445c9 + 2bfcc497086de48b15861bb56407324facef4c4a - + https://github.com/dotnet/roslyn - 77372c66fd54927312b5b0a2e399e192f74445c9 + 2bfcc497086de48b15861bb56407324facef4c4a - + https://github.com/dotnet/msbuild - b783f61ef6fcadef68c54daac21e18c1c20fc071 + d4cb14fe4d2e6df0327308feab18ccbb2046246c - + https://github.com/dotnet/msbuild - b783f61ef6fcadef68c54daac21e18c1c20fc071 + d4cb14fe4d2e6df0327308feab18ccbb2046246c - + https://github.com/nuget/nuget.client - 8b658e2eee6391936887b9fd1b39f7918d16a9cb + 63958aab19b7120862ff55eac32ab6a155596a59 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 4bbafbd3474cb3c927f792a9b6749fe89277ef7d + 2d3f1fe4807a21879cedba9d3fde8cd329fb17f2 - + https://github.com/dotnet/emsdk - 4bbafbd3474cb3c927f792a9b6749fe89277ef7d + 2d3f1fe4807a21879cedba9d3fde8cd329fb17f2 - + https://github.com/dotnet/deployment-tools - d260974045322b57853c0b1625123cf92b330574 + 822ff266c5f999ab9ceb6928df59d79285ea4a4f - + https://github.com/dotnet/deployment-tools - d260974045322b57853c0b1625123cf92b330574 + 822ff266c5f999ab9ceb6928df59d79285ea4a4f @@ -277,9 +277,9 @@ 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 - b2107ab9a2b96b609f16997525f694f587e3018e + 1dd4b3265f01a50b20522fd3d7f3cd315db5be6b - + https://github.com/dotnet/aspire - b2107ab9a2b96b609f16997525f694f587e3018e + 1dd4b3265f01a50b20522fd3d7f3cd315db5be6b diff --git a/eng/Versions.props b/eng/Versions.props index a99f319b4d07..dab54084aad4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ preview rtm servicing - 2 + 3 30 @@ -52,11 +52,11 @@ - 9.0.0-preview.2.24113.9 + 9.0.0-preview.2.24122.2 - 9.0.0-preview.2.24113.3 + 9.0.0-preview.2.24122.1 @@ -68,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 @@ -77,49 +77,49 @@ - 9.0.0-preview.2.24114.9 - 9.0.0-preview.2.24114.9 - 9.0.0-preview.2.24114.9 - 9.0.0-preview.2.24114.9 - 9.0.0-preview.2.24114.9 - 9.0.0-preview.2.24114.9 - 9.0.0-preview.2.24114.9 + 9.0.0-preview.2.24121.1 + 9.0.0-preview.2.24121.1 + 9.0.0-preview.2.24121.1 + 9.0.0-preview.2.24121.1 + 9.0.0-preview.2.24121.1 + 9.0.0-preview.2.24121.1 + 9.0.0-preview.2.24121.1 0.2.0 - 9.0.100-preview.2.24115.9 - 9.0.100-preview.2.24115.9 - 9.0.100-preview.2.24115.9 + 9.0.100-preview.2.24123.3 + 9.0.100-preview.2.24123.3 + 9.0.100-preview.2.24123.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24114.13 + 4.10.0-2.24122.3 - 9.0.0-preview.2.24115.1 + 9.0.0-preview.2.24123.1 - 9.0.0-preview.2.24115.1 - 9.0.0-preview.2.24115.1 - 9.0.0-preview.2.24115.1 - 9.0.0-preview.2.24115.1 - 9.0.0-preview.2.24115.1 + 9.0.0-preview.2.24123.1 + 9.0.0-preview.2.24123.1 + 9.0.0-preview.2.24123.1 + 9.0.0-preview.2.24123.1 + 9.0.0-preview.2.24123.1 2.1.0 - 9.0.0-preview.2.24114.2 - 9.0.0-preview.2.24114.2 - 9.0.0-preview.2.24114.2 - 9.0.0-preview.2.24114.2 + 9.0.0-preview.2.24122.1 + 9.0.0-preview.2.24122.1 + 9.0.0-preview.2.24122.1 + 9.0.0-preview.2.24122.1 @@ -131,11 +131,11 @@ - 6.10.0-preview.2.32 + 6.10.0-preview.2.41 - 2.0.0-preview.1.24113.1 + 2.0.0-preview.1.24113.2 @@ -189,7 +189,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 @@ -249,14 +250,14 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24114-01 + 17.10.0-preview-24120-01 9.0.0-alpha.1.24058.10 9.0.0-preview.24057.2 9.0.100-preview.1 - 9.0.0-preview.1.24114.5 + 9.0.0-preview.1.24116.3 9.0.100-preview.1 9.0.0-preview.1.9973 34.99.0-preview.1.151 @@ -265,7 +266,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.2.24113.2 + 9.0.0-preview.2.24121.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index d25e605c08e7..16d676186c87 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -211,7 +211,7 @@ jobs: - ${{ if eq(parameters.targetOS, 'windows') }}: - script: | - call $(sourcesPath)\build.cmd -ci -cleanWhileBuilding -prepareMachine + call $(sourcesPath)\build.cmd -ci -cleanWhileBuilding -prepareMachine ${{ parameters.extraProperties }} displayName: Build - ${{ else }}: diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index e53063ee0d00..de9aa765d930 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -826,3 +826,16 @@ stages: useMonoRuntime: true targetOS: windows targetArchitecture: x86 + + - template: ../jobs/vmr-build.yml + parameters: + buildName: Windows_Pgo + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemandsWindows }} + targetOS: windows + targetArchitecture: x64 + extraProperties: /p:PgoInstrument=true diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1 index 893a9611113f..e3862f0e920d 100644 --- a/eng/restore-toolset.ps1 +++ b/eng/restore-toolset.ps1 @@ -5,7 +5,7 @@ function InitializeCustomSDKToolset { # The following frameworks and tools are used only for testing. # Do not attempt to install them in source build. - if ($env:DotNetBuildFromSource -eq "true") { + if ($productBuild -or $properties -like "*DotNetBuildRepo=true*") { return } diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh index cd17755d506b..f4352ac20cee 100644 --- a/eng/restore-toolset.sh +++ b/eng/restore-toolset.sh @@ -5,7 +5,7 @@ function InitializeCustomSDKToolset { # The following frameworks and tools are used only for testing. # Do not attempt to install them in source build. - if [[ "${DotNetBuildFromSource:-}" == "true" ]]; then + if [[ $product_build == true || $properties == *"DotNetBuildRepo=true"* ]]; then return fi diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 5cc142c57e5e..52bed083548c 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -34,12 +34,15 @@ runtime + + $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) - $(BuildArchitecture) - - + $(BuildArchitecture) + + $(TargetArchitecture) AnyCPU @@ -50,11 +53,12 @@ $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) $(BuildRid) - $(BuildRid) + $(BuildRid.Substring(0, $(BuildRid.LastIndexOf('-'))))-$(TargetArchitecture) - - true - false + + false + true $(__PortableTargetOS)-$(TargetArchitecture) freebsd-$(TargetArchitecture) @@ -188,6 +192,7 @@ NonShipping.Packages. $([MSBuild]::NormalizeDirectory('$(PrereqsPackagesDir)', 'reference')) + $([MSBuild]::NormalizeDirectory('$(PrereqsPackagesDir)', 'reference-assets')) Private.SourceBuilt.Artifacts Private.SourceBuilt.Prebuilts diff --git a/src/SourceBuild/content/README.md b/src/SourceBuild/content/README.md index 979698d823a7..58dbd7288b9b 100644 --- a/src/SourceBuild/content/README.md +++ b/src/SourceBuild/content/README.md @@ -173,7 +173,7 @@ Alternatively, you can also provide a manifest file where this information can b Sometimes you want to make a change in a repository and test that change in the VMR. You could of course make the change in the VMR directly (locally, as the VMR is read-only for now) but in case it's already available in your repository, you can synchronize it into the VMR (again locally). -To do this, you can either start a [dotnet/dotnet](https://github.com/dotnet/dotnet) Codespace - you will see instructions right after it starts. Alternatively, you can clone the repository locally and use the [eng/vmr-sync.sh](../../eng/vmr-sync.sh) or [eng/vmr-sync.ps1](../../eng/vmr-sync.ps1) script to pull your changes in. Please refer to the documentation in the script for more details. +To do this, you can either start a [dotnet/dotnet](https://github.com/dotnet/dotnet) Codespace - you will see instructions right after it starts. Alternatively, you can clone the repository locally and use the [vmr-sync.sh](src/installer/eng/vmr-sync.sh) or [vmr-sync.ps1](src/installer/eng/vmr-sync.ps1) script to pull your changes in. Please refer to the documentation in the script for more details. ## List of components diff --git a/src/SourceBuild/content/eng/tools/generate-graphviz/generate-graphviz.proj b/src/SourceBuild/content/eng/tools/generate-graphviz/generate-graphviz.proj deleted file mode 100644 index b35a7aa50637..000000000000 --- a/src/SourceBuild/content/eng/tools/generate-graphviz/generate-graphviz.proj +++ /dev/null @@ -1,49 +0,0 @@ - - - - $(NetCurrent) - - - - - - - - - - - - - - - - - - - $(BaseIntermediateOutputPath)graphviz.dot - $(BaseIntermediateOutputPath)graphviz.png - digraph { -graph [ dpi = 150 ] -@(RepoLink -> '%(Text)') -} - - - - - - - - - - - - diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 77f9a7ca8373..0a2a25dc8cc2 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -33,6 +33,11 @@ $(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(OriginalNuGetConfigFile)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'source-built-sdks')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsShippingPackagesDir)', '$(RepositoryName)')) + $(ReferencePackagesDir) + $([MSBuild]::NormalizeDirectory('$(ArtifactsNonShippingPackagesDir)', '$(RepositoryName)')) + $(ReferencePackagesDir) + $([MSBuild]::ValueOrDefault('$(ARCADE_BOOTSTRAP_VERSION)', '$(ArcadeSdkVersion)')) @@ -205,8 +210,8 @@ --> - - + + - + + @@ -244,11 +249,6 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 2bad689acee5..241a76523d7f 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -16,10 +16,6 @@ $(BuildScript) $(BuildActions) $(BuildArgs) - - AllPackages - $(ArtifactsLogDir)$(RepositoryName).log true @@ -32,20 +28,6 @@ $(IntermediateSymbolsRootDir)$(RepositoryName) - - - - - - - - - - - - - - @@ -54,6 +36,28 @@ + + + + + + + source-built-%(Identity) + source-built-transport-%(Identity) + $(ArtifactsShippingPackagesDir)/%(Identity)/ + $(ArtifactsNonShippingPackagesDir)/%(Identity)/ + + + + + + + + + + - - source-built - - source-built-transport - $(SourceBuiltShippingNuGetSourceName);$(SourceBuiltNonShippingNuGetSourceName) - ExtraSources - $(SourceBuildSources);$(ExtraSourcesNuGetSourceName) prebuilt previously-source-built reference-packages - $(SourceBuildSources);$(PrebuiltNuGetSourceName);$(PreviouslySourceBuiltNuGetSourceName);$(ReferencePackagesNuGetSourceName) + + <_CommonBuildSources Include="@(DependentRepoSourceName)" /> + <_CommonBuildSources Include="$(ExtraSourcesNuGetSourceName)" Condition="'$(ExtraRestoreSourcePath)' != ''" /> + + + + <_BuildSources Condition="'$(DotNetBuildSourceOnly)' == 'true'" + Include="$(PrebuiltNuGetSourceName);$(PreviouslySourceBuiltNuGetSourceName);$(ReferencePackagesNuGetSourceName)" /> + <_BuildSources Include="@(_CommonBuildSources)" /> + + + + - <_CurrentSourceBuiltPackages Include="$(ArtifactsPackagesDir)**\*.nupkg" + + <_CurrentSourceBuiltPackages Include="@(DependentRepoPackageFile)" Condition="!$([System.String]::Copy('%(Identity)').EndsWith('.symbols.nupkg'))" /> <_PreviouslyBuiltSourceBuiltPackages Include="$(PrebuiltSourceBuiltPackagesPath)*.nupkg" /> @@ -269,11 +286,12 @@ - + - <_DependentProject Include="@(RepositoryReference -> '%(Identity).proj')" /> + <_DependentProject Include="@(TransitiveRepositoryReference -> '%(Identity).proj')" /> $(BuildCommand) $(FullCommand) /v:$(LogVerbosity) - $(FullCommand) >> $(RepoConsoleLogFile) 2>&1 + $(FullCommand) > $(RepoConsoleLogFile) 2>&1 @@ -398,21 +414,21 @@ - $(ArtifactsNonShippingPackagesDir) - $(ReferencePackagesDir) + $(RepoArtifactsNonShippingPackagesDir) + $(ReferencePackagesDir) - $(ArtifactsShippingPackagesDir) - $(ReferencePackagesDir) + $(RepoArtifactsShippingPackagesDir) + $(ReferencePackagesDir) - - - + + $(ArtifactsAssetsDir) + $(ReferenceAssetsDir) + + @@ -506,8 +522,8 @@ Inputs="$(MSBuildProjectFullPath)" Outputs="$(BaseIntermediateOutputPath)ExtractToolPackage.complete"> - <_ToolPackagesRoot Condition="'$(RepositoryName)' != 'source-build-reference-packages'">$(ArtifactsNonShippingPackagesDir) - <_ToolPackagesRoot Condition="'$(RepositoryName)' == 'source-build-reference-packages'">$(ReferencePackagesDir) + <_ToolPackagesRoot Condition="'$(ReferenceOnlyRepoArtifacts)' != 'true'">$(RepoArtifactsNonShippingPackagesDir) + <_ToolPackagesRoot Condition="'$(ReferenceOnlyRepoArtifacts)' == 'true'">$(ReferencePackagesDir) @@ -694,4 +710,77 @@ + + + + <_TransitiveRepositoryReference Include="@(RepositoryReference)" /> + + + + + + + + + <_TransitiveRepositoryReference Include="@(_DependencyTransitiveRepositoryReference)" + RemoveMetadata="MSBuildSourceProjectFile;MSBuildSourceTargetName;OriginalItemSpec" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_NextIndent>$(DependencyGraphIndent)__ + + + + + + + + + + + <_DependencyGraphString>@(_DependencyGraphString, '') + <_LineBreak>%0a + $(DependencyGraphIndent)-_$(RepositoryName)$(_LineBreak)$(_DependencyGraphString) + + + diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index 59bd8e296c61..24dddd442f40 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -22,11 +22,16 @@ - - - - + + + + + + + + + diff --git a/src/SourceBuild/content/repo-projects/cecil.proj b/src/SourceBuild/content/repo-projects/cecil.proj index c4068fe7b99c..9cb33b7c4fa7 100644 --- a/src/SourceBuild/content/repo-projects/cecil.proj +++ b/src/SourceBuild/content/repo-projects/cecil.proj @@ -4,4 +4,8 @@ + + + + diff --git a/src/SourceBuild/content/repo-projects/command-line-api.proj b/src/SourceBuild/content/repo-projects/command-line-api.proj index a16b2412a19b..28ba676c0e24 100644 --- a/src/SourceBuild/content/repo-projects/command-line-api.proj +++ b/src/SourceBuild/content/repo-projects/command-line-api.proj @@ -10,4 +10,8 @@ + + + + diff --git a/src/SourceBuild/content/repo-projects/deployment-tools.proj b/src/SourceBuild/content/repo-projects/deployment-tools.proj index 85976198a006..7fd4eb25fb1f 100644 --- a/src/SourceBuild/content/repo-projects/deployment-tools.proj +++ b/src/SourceBuild/content/repo-projects/deployment-tools.proj @@ -2,7 +2,11 @@ - + + + + + diff --git a/src/SourceBuild/content/repo-projects/diagnostics.proj b/src/SourceBuild/content/repo-projects/diagnostics.proj index c4068fe7b99c..9cb33b7c4fa7 100644 --- a/src/SourceBuild/content/repo-projects/diagnostics.proj +++ b/src/SourceBuild/content/repo-projects/diagnostics.proj @@ -4,4 +4,8 @@ + + + + diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj index 0de74d67944c..f09de2ca8958 100644 --- a/src/SourceBuild/content/repo-projects/dotnet.proj +++ b/src/SourceBuild/content/repo-projects/dotnet.proj @@ -11,41 +11,7 @@ - If we have a repo that is not in sdk's dependency tree, we can still build it by including it here. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/SourceBuild/content/repo-projects/emsdk.proj b/src/SourceBuild/content/repo-projects/emsdk.proj index df9c063263e6..a210d9c4bd7f 100644 --- a/src/SourceBuild/content/repo-projects/emsdk.proj +++ b/src/SourceBuild/content/repo-projects/emsdk.proj @@ -14,4 +14,8 @@ + + + + diff --git a/src/SourceBuild/content/repo-projects/format.proj b/src/SourceBuild/content/repo-projects/format.proj index 9418953b7e8d..91744a768953 100644 --- a/src/SourceBuild/content/repo-projects/format.proj +++ b/src/SourceBuild/content/repo-projects/format.proj @@ -2,9 +2,17 @@ + + + + + + - + + + diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj index bac7243b5321..2749c6f02bb1 100644 --- a/src/SourceBuild/content/repo-projects/fsharp.proj +++ b/src/SourceBuild/content/repo-projects/fsharp.proj @@ -20,8 +20,12 @@ - - + + + + + + diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj index 5c232717e08b..518ca8aad198 100644 --- a/src/SourceBuild/content/repo-projects/installer.proj +++ b/src/SourceBuild/content/repo-projects/installer.proj @@ -1,9 +1,8 @@ - - $(TargetOS) - $(TargetRid.Substring(0, $(TargetRid.IndexOf("-")))) + + false $(ProjectDirectory)build$(ShellExtension) @@ -11,42 +10,57 @@ $(FlagParameterPrefix)pack $(FlagParameterPrefix)publish - $(BuildArgs) $(FlagParameterPrefix)runtime-id $(TargetRid) - $(BuildArgs) /p:NETCoreAppMaximumVersion=99.9 - $(BuildArgs) /p:OSName=$(OSNameOverride) + + $(BuildArgs) /p:OSName=$(TargetRid.Substring(0, $(TargetRid.IndexOf("-")))) $(BuildArgs) /p:PortableOSName=$(__PortableTargetOS) $(BuildArgs) /p:Rid=$(TargetRid) + $(BuildArgs) /p:Architecture=$(TargetArchitecture) $(BuildArgs) /p:DOTNET_INSTALL_DIR=$(DotNetRoot) $(BuildArgs) /p:AspNetCoreInstallerRid=$(TargetRid) $(BuildArgs) /p:PortableBuild=true - $(BuildArgs) /p:CoreSetupRid=$(TargetRid) + $(BuildArgs) /p:NetRuntimeRid=$(TargetRid) + + $(BuildArgs) /p:SkipBuildingInstallers=true - $(BuildArgs) /p:PublicBaseURL=file:%2F%2F$(ArtifactsAssetsDir) - + + $(BuildArgs) /p:FallbackPublicBaseURL=https://dotnetbuilds.blob.core.windows.net/public/ $(BuildArgs) /p:UsePortableLinuxSharedFramework=false + + $(BuildArgs) /p:PgoInstrument=true + + + - + + + + + + + - + + + + + + + + + + + + $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', 'artifacts-layout')) + + + $(ArtifactsAssetsDir)$(SourceBuiltArtifactsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension) + $(SourceBuiltLayoutDir).version + $(SourceBuiltLayoutDir)PackageVersions.props + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj index bd8378b0a33b..a9219d82cb8d 100644 --- a/src/SourceBuild/content/repo-projects/msbuild.proj +++ b/src/SourceBuild/content/repo-projects/msbuild.proj @@ -9,8 +9,12 @@ - + + + + + diff --git a/src/SourceBuild/content/repo-projects/nuget-client.proj b/src/SourceBuild/content/repo-projects/nuget-client.proj index a0797bcb8ab0..b29f0595eaa9 100644 --- a/src/SourceBuild/content/repo-projects/nuget-client.proj +++ b/src/SourceBuild/content/repo-projects/nuget-client.proj @@ -8,9 +8,9 @@ $([MSBuild]::NormalizePath('$(ProjectDirectory)', 'eng', 'source-build', 'build$(ShellExtension)')) - - + + diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj deleted file mode 100644 index d96d864c7751..000000000000 --- a/src/SourceBuild/content/repo-projects/package-source-build.proj +++ /dev/null @@ -1,69 +0,0 @@ - - - - - true - - false - - - - - - - - - $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(SourceBuiltArtifactsTarballName)')) - $([MSBuild]::NormalizeDirectory('$(SourceBuildTarballStagingDir)', 'SourceBuildReferencePackages')) - - - - - - - - - - - - - - - - - - - - - $(ArtifactsAssetsDir)$(SourceBuiltArtifactsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension) - .version - - - - - - - - - - - - - - - - - - diff --git a/src/SourceBuild/content/repo-projects/razor.proj b/src/SourceBuild/content/repo-projects/razor.proj index 800961adeb73..99eca651e3bc 100644 --- a/src/SourceBuild/content/repo-projects/razor.proj +++ b/src/SourceBuild/content/repo-projects/razor.proj @@ -2,8 +2,11 @@ - + + + + diff --git a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj index 23819f4994d4..eee275a054be 100644 --- a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj +++ b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj @@ -8,8 +8,12 @@ + + + - + + diff --git a/src/SourceBuild/content/repo-projects/roslyn.proj b/src/SourceBuild/content/repo-projects/roslyn.proj index 5f1c34aa5e98..dfbeb7102904 100644 --- a/src/SourceBuild/content/repo-projects/roslyn.proj +++ b/src/SourceBuild/content/repo-projects/roslyn.proj @@ -28,9 +28,12 @@ - - + + + + + diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index aa5b3296298f..3dcaa1eb5527 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -19,6 +19,7 @@ $(BuildArgs) /p:BaseOS=$(BaseOS) $(BuildArgs) /p:DotNetBuildRuntimeWasmEnableThreads=true $(BuildArgs) /p:DotNetBuildRuntimeNativeAOTRuntimePack=true + $(BuildArgs) $(FlagParameterPrefix)pgoinstrument @@ -33,8 +34,13 @@ - - + + + + + + + diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj index 25c6f1b9cd57..6d9422b61f06 100644 --- a/src/SourceBuild/content/repo-projects/scenario-tests.proj +++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj @@ -1,9 +1,13 @@ - - + + + + + + diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index 69c6a2826dc4..d307692ac8c1 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -14,17 +14,28 @@ - + + + + + + - + + + + + + - - - - - + + + + + + diff --git a/src/SourceBuild/content/repo-projects/source-build-externals.proj b/src/SourceBuild/content/repo-projects/source-build-externals.proj index a391c4cd6689..c86415ade2f4 100644 --- a/src/SourceBuild/content/repo-projects/source-build-externals.proj +++ b/src/SourceBuild/content/repo-projects/source-build-externals.proj @@ -10,4 +10,9 @@ true + + + + + diff --git a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj index 7c3650d741fc..c7bb4961abcf 100644 --- a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj +++ b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj @@ -3,6 +3,7 @@ + true true @@ -30,4 +31,12 @@ SourcePath="$(LocalNuGetPackageCacheDirectory)" /> + + + + + diff --git a/src/SourceBuild/content/repo-projects/sourcelink.proj b/src/SourceBuild/content/repo-projects/sourcelink.proj index 87026a8e9930..3f0451a3867a 100644 --- a/src/SourceBuild/content/repo-projects/sourcelink.proj +++ b/src/SourceBuild/content/repo-projects/sourcelink.proj @@ -12,4 +12,8 @@ + + + + diff --git a/src/SourceBuild/content/repo-projects/symreader.proj b/src/SourceBuild/content/repo-projects/symreader.proj index c4068fe7b99c..9cb33b7c4fa7 100644 --- a/src/SourceBuild/content/repo-projects/symreader.proj +++ b/src/SourceBuild/content/repo-projects/symreader.proj @@ -4,4 +4,8 @@ + + + + diff --git a/src/SourceBuild/content/repo-projects/templating.proj b/src/SourceBuild/content/repo-projects/templating.proj index 999d5a167488..9677f1100ce1 100644 --- a/src/SourceBuild/content/repo-projects/templating.proj +++ b/src/SourceBuild/content/repo-projects/templating.proj @@ -9,8 +9,12 @@ - - + + + + + + diff --git a/src/SourceBuild/content/repo-projects/test-templates.proj b/src/SourceBuild/content/repo-projects/test-templates.proj index a272afd4f160..3013d77fdb4a 100644 --- a/src/SourceBuild/content/repo-projects/test-templates.proj +++ b/src/SourceBuild/content/repo-projects/test-templates.proj @@ -6,7 +6,10 @@ - + + + + diff --git a/src/SourceBuild/content/repo-projects/vstest.proj b/src/SourceBuild/content/repo-projects/vstest.proj index c228f58a635b..327d8aea1bdf 100644 --- a/src/SourceBuild/content/repo-projects/vstest.proj +++ b/src/SourceBuild/content/repo-projects/vstest.proj @@ -9,8 +9,12 @@ + + + - + + 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 5b0f5d0e15d2..338c94dcdae7 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 d02f4b5ee736..d07075982105 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/SourceBuild/patches/arcade/0001-Ignore-standard-error-warning-format-in-SB-inner-com.patch b/src/SourceBuild/patches/arcade/0001-Ignore-standard-error-warning-format-in-SB-inner-com.patch new file mode 100644 index 000000000000..4752e424016e --- /dev/null +++ b/src/SourceBuild/patches/arcade/0001-Ignore-standard-error-warning-format-in-SB-inner-com.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Thu, 22 Feb 2024 14:05:54 -0600 +Subject: [PATCH] Ignore standard error warning format in SB inner command + +Backport: https://github.com/dotnet/arcade/pull/14496 +--- + .../tools/SourceBuild/SourceBuildArcadeBuild.targets | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets +index 6ef44082..72b9c688 100644 +--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets ++++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets +@@ -214,6 +214,7 @@ + + + diff --git a/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch b/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch index ae3b5241eaaa..9f9b4b4156dc 100644 --- a/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch +++ b/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch @@ -43,10 +43,10 @@ Backport: https://github.com/dotnet/source-build/issues/3663 35 files changed, 82 insertions(+), 73 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props -index 0fe610fc2..019d01d14 100644 +index 4682f1d8c..1da4c0161 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -36,8 +36,8 @@ +@@ -34,8 +34,8 @@ $(MSBuildThisFileDirectory)artifacts/ $(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ @@ -54,9 +54,9 @@ index 0fe610fc2..019d01d14 100644 - $(ArtifactsDir)/bin/fsyacc/$(Configuration)/net8.0/fsyacc.dll + $(ArtifactsDir)/bin/fslex/$(Configuration)/net9.0/fslex.dll + $(ArtifactsDir)/bin/fsyacc/$(Configuration)/net9.0/fsyacc.dll + NO_CHECKNULLS;BUILDING_WITH_LKG;NO_NULLCHECKING_LIB_SUPPORT;$(DefineConstants) - diff --git a/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/buildtools/AssemblyCheck/AssemblyCheck.fsproj index 46ffb722c..9d391689d 100644 --- a/buildtools/AssemblyCheck/AssemblyCheck.fsproj @@ -110,10 +110,10 @@ index fc072b7cf..4110186e5 100644 false LatestMajor diff --git a/eng/build.sh b/eng/build.sh -index 3b992d6bf..3a4444081 100755 +index b8915397d..4e020e84c 100755 --- a/eng/build.sh +++ b/eng/build.sh -@@ -264,8 +264,8 @@ function BuildSolution { +@@ -269,8 +269,8 @@ function BuildSolution { MSBuild "$repo_root/buildtools/buildtools.proj" /restore "$bltools" /p:Configuration=$bootstrap_config mkdir -p "$bootstrap_dir" @@ -124,7 +124,7 @@ index 3b992d6bf..3a4444081 100755 fi if [ ! -f "$bootstrap_dir/fsc.exe" ]; then local bltools="" -@@ -274,7 +274,7 @@ function BuildSolution { +@@ -279,7 +279,7 @@ function BuildSolution { fi BuildMessage="Error building bootstrap" MSBuild "$repo_root/Proto.sln" /restore "$bltools" /p:Configuration=$bootstrap_config @@ -389,7 +389,7 @@ index e3c796d0b..e4926cd6c 100644 true xunit diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj -index a9dd53828..a33c287be 100644 +index ec4fc441f..5d2b5a0ce 100644 --- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj +++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj @@ -3,8 +3,8 @@ @@ -469,7 +469,7 @@ index 4b6c5c534..1b20371c4 100644 FSharp.Core.UnitTests diff --git a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj -index 5cfcba98c..c67b8f85d 100644 +index 8c1816177..81762e504 100644 --- a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj +++ b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj @@ -1,8 +1,8 @@ diff --git a/src/SourceBuild/patches/roslyn/0001-Set-NetRoslyn-value-for-VMR-build.patch b/src/SourceBuild/patches/roslyn/0001-Set-NetRoslyn-value-for-VMR-build.patch new file mode 100644 index 000000000000..ab49fefaa8e8 --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0001-Set-NetRoslyn-value-for-VMR-build.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Fri, 23 Feb 2024 09:48:43 -0600 +Subject: [PATCH] Set NetRoslyn value for VMR build + +Backport: https://github.com/dotnet/roslyn/pull/71704 +--- + eng/targets/TargetFrameworks.props | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props +index a7643fcbcfd..054428128b3 100644 +--- a/eng/targets/TargetFrameworks.props ++++ b/eng/targets/TargetFrameworks.props +@@ -51,6 +51,7 @@ + $(NetCurrent) + $(NetCurrent);$(NetPrevious) + $(NetCurrent);$(NetPrevious) ++ $(NetCurrent) + $(NetCurrent) + + diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index feb6ebf2e177..efb1baa40ed4 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/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 938dba427f25..812e0d6bd51b 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -4,7 +4,7 @@ $(CoreSdkTargetFramework) true Microsoft.DotNet.Cli.Build - $(DefineConstants);SOURCE_BUILD + $(DefineConstants);SOURCE_BUILD true true @@ -16,7 +16,7 @@ - + diff --git a/src/finalizer/CMakeLists.txt b/src/finalizer/CMakeLists.txt index aac5c20b3fdf..17b27a104dc9 100644 --- a/src/finalizer/CMakeLists.txt +++ b/src/finalizer/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15.5) +cmake_minimum_required(VERSION 3.20) # Create project named finalizer, this will # will generate Finalizer.vcxproj @@ -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 d68418b9bcd6..03a1213ba3cb 100644 --- a/src/finalizer/finalizer.cpp +++ b/src/finalizer/finalizer.cpp @@ -492,12 +492,64 @@ extern "C" HRESULT DetectSdk(LPWSTR sczSdkFeatureBandVersion, LPWSTR sczArchitec 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 1a6cd5df05ba..97bc60b130fb 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 ad9af2548e97..e6cd301f7a46 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 9a6e21871aaa..8006710cd9ea 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -6,7 +6,7 @@ false true none - true + true @@ -15,8 +15,8 @@ RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" /> - - + + diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index b17e885e4e54..fbe03b6e48d9 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -3,12 +3,12 @@ 8.0.100 - - - - - - + + + + + + diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 760318166bb4..a13289946238 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -24,8 +24,8 @@ - - + + @@ -36,8 +36,8 @@ - - + + @@ -46,8 +46,8 @@ - - + + @@ -59,8 +59,8 @@ - - + + @@ -73,8 +73,8 @@ - - + + @@ -89,16 +89,16 @@ - - + + - - + + @@ -129,7 +129,7 @@ - + diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 4121ddb9cedf..4a996f927e91 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -2,7 +2,7 @@ @@ -147,7 +147,7 @@ - + diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets index 814abbe71322..ac662ab94c6c 100644 --- a/src/redist/targets/GenerateArchives.targets +++ b/src/redist/targets/GenerateArchives.targets @@ -20,25 +20,12 @@ DestinationArchive="$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk).zip" OverwriteDestination="true" /> - - - - diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 6c5a7a912e72..bd36c5e06fd5 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -247,7 +247,7 @@ <_KnownRuntimeIdentiferPlatforms Include="any;aot;freebsd;illumos;solaris;unix" /> - <_ExcludedKnownRuntimeIdentiferPlatforms Include="rhel.6;tizen.4.0.0;tizen.5.0.0" Condition="'$(DotNetBuildFromSource)' != 'true'" /> - <_ExcludedKnownRuntimeIdentiferPlatforms Include="rhel.6" Condition="'$(DotNetBuildFromSource)' == 'true' and !$(ProductMonikerRid.StartsWith('rhel.6-'))" /> - <_ExcludedKnownRuntimeIdentiferPlatforms Include="tizen.4.0.0" Condition="'$(DotNetBuildFromSource)' == 'true' and !$(ProductMonikerRid.StartsWith('tizen.4.0.0-'))" /> - <_ExcludedKnownRuntimeIdentiferPlatforms Include="tizen.5.0.0" Condition="'$(DotNetBuildFromSource)' == 'true' and !$(ProductMonikerRid.StartsWith('tizen.5.0.0-'))" /> + <_ExcludedKnownRuntimeIdentiferPlatforms Include="rhel.6;tizen.4.0.0;tizen.5.0.0" Condition="'$(DotNetBuildSourceOnly)' != 'true'" /> + <_ExcludedKnownRuntimeIdentiferPlatforms Include="rhel.6" Condition="'$(DotNetBuildSourceOnly)' == 'true' and !$(ProductMonikerRid.StartsWith('rhel.6-'))" /> + <_ExcludedKnownRuntimeIdentiferPlatforms Include="tizen.4.0.0" Condition="'$(DotNetBuildSourceOnly)' == 'true' and !$(ProductMonikerRid.StartsWith('tizen.4.0.0-'))" /> + <_ExcludedKnownRuntimeIdentiferPlatforms Include="tizen.5.0.0" Condition="'$(DotNetBuildSourceOnly)' == 'true' and !$(ProductMonikerRid.StartsWith('tizen.5.0.0-'))" /> - + $(VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion) - $(MicrosoftAspNetCoreAppRuntimePackageVersion) + $(MicrosoftAspNetCoreAppRuntimePackageVersion) - $(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion) - $(MicrosoftNETCoreAppRuntimePackageVersion) + $(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion) + $(MicrosoftNETCoreAppRuntimePackageVersion) $(VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion) + $(MicrosoftWindowsDesktopAppRuntimePackageVersion) - - - $(VSRedistCommonNetCoreTargetingPackx6490PackageVersion) - - $(MicrosoftAspNetCoreAppRefInternalPackageVersion) - $(VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion) 3.0.0 @@ -34,11 +27,13 @@ true https://dotnetbuilds.blob.core.windows.net/internal/ - https://dotnetcli.blob.core.windows.net/dotnet/ + + https://dotnetcli.blob.core.windows.net/dotnet/ + $(OfficialBaseURL) - $(HostRid) - $(OSName)-$(Architecture) - $(HostRid.Replace('mariner.2.0', 'cm.2')) + $(HostRid) + $(OSName)-$(Architecture) + $(HostRid.Replace('mariner.2.0', 'cm.2')) -internal @@ -46,14 +41,14 @@ - $(CoreSetupRid) + $(NetRuntimeRid) $(InstallerTargetArchitecture) - $(CoreSetupRid) + $(NetRuntimeRid) $(Architecture) $(OSName)-$(InstallerTargetArchitecture) - rhel.7-aarch64 + rhel.7-aarch64 x64 x86 @@ -77,7 +72,7 @@ netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1]) - $(CoreSetupRid) + $(NetRuntimeRid) $(ProductMonikerRid) linux-$(Architecture) dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) @@ -85,7 +80,7 @@ windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(HostOSName)-$(BuildArchitecture) - $(SharedFrameworkRid) + $(SharedFrameworkRid) $(SharedFrameworkRid) linux-x64 @@ -106,16 +101,31 @@ aspnetcore_base_runtime.version + + - $(PublicBaseURL)Runtime/ - $(PublicBaseURL) - $(PublicBaseURL)aspnetcore/Runtime/ - $(PublicBaseURL) - $(PublicBaseURL)WindowsDesktop/ - $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimePackageVersion) - $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) + $(PublicBaseURL)Runtime/$(NetRuntimeBlobVersion) + $(PublicBaseURL) + + $(OfficialBaseURL)Runtime/$(NETStandardTargetingPackBlobVersion) + + $(PublicBaseURL)aspnetcore/Runtime/$(AspNetCoreBlobVersion) + $(PublicBaseURL) + + $(FallbackPublicBaseURL)aspnetcore/Runtime/$(AspNetCoreBlobVersion) + + $(PublicBaseURL)WindowsDesktop/$(WindowsDesktopBlobVersion) + $(PublicBaseURL) + + $(PublicBaseURL)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion) + $(PublicBaseURL) + + $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimePackageVersion) + $(NetRuntimeDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) + + win-$(AlternateArchitecture) win-arm64 @@ -128,8 +138,7 @@ - $(CoreSetupRootUrl)$(CoreSetupBlobVersion) - $(CoreSetupRootUrl) + $(NetRuntimeRootUrl) $(CombinedFrameworkHostArchiveFileName) @@ -199,69 +208,76 @@ - $(CoreSetupRootUrl)$(CoreSetupBlobVersion) + $(NetRuntimeRootUrl) $(DownloadedRuntimeDepsInstallerFileName) - $(CoreSetupRootUrl)$(CoreSetupBlobVersion) + $(NetRuntimeRootUrl) $(DownloadedSharedFrameworkInstallerFileName) - $(CoreSetupRootUrl)$(CoreSetupBlobVersion) + $(NetRuntimeRootUrl) $(DownloadedSharedHostInstallerFileName) - $(CoreSetupRootUrl)$(CoreSetupBlobVersion) + $(NetRuntimeRootUrl) $(DownloadedHostFxrInstallerFileName) - $(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion) + $(NetRuntimeRootUrl) $(DownloadedNetCoreAppTargetingPackInstallerFileName) - $(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion) - $(CoreSetupRootUrl)3.0.0 + $(NetStandardTargetingPackRootUrl) $(DownloadedNetStandardTargetingPackInstallerFileName) - $(CoreSetupRootUrl)$(CoreSetupBlobVersion) + $(NetRuntimeRootUrl) $(DownloadedNetCoreAppHostPackInstallerFileName) + - $(CoreSetupRootUrl)$(CoreSetupBlobVersion) + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And !$(Architecture.StartsWith('arm'))"> + $(NetRuntimeRootUrl) + + $(FallbackPublicBaseURL)Runtime/$(NetRuntimeBlobVersion) $(DownloadedAlternateNetCoreAppHostPackInstallerFileName) - $(CoreSetupRootUrl)$(CoreSetupBlobVersion) + $(NetRuntimeRootUrl) + + $(FallbackPublicBaseURL)Runtime/$(NetRuntimeBlobVersion) $(DownloadedArm64NetCoreAppHostPackInstallerFileName) - $(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopTargetingPackBlobVersion) + $(WinFormsAndWpfSharedFxRootUrl) $(DownloadedWindowsDesktopTargetingPackInstallerFileName) - $(PublicBaseURL)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion) - $(PublicBaseURL) + $(ToolsetArchiveRootUrl) dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip sdk/$(Version) @@ -269,8 +285,7 @@ - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) - $(AspNetCoreSharedFxRootUrl) + $(AspNetCoreSharedFxRootUrl) $(AspNetCoreSharedFxArchiveFileName) shared/Microsoft.AspNetCore.App @@ -280,39 +295,38 @@ https://github.com/aspnet/AspNetCore/issues/8806 --> - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion) + $(AspNetCoreSharedFxRootUrl) $(AspNetTargetingPackArchiveFileName) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion) + $(AspNetCoreSharedFxRootUrl) $(DownloadedAspNetTargetingPackInstallerFileName) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) + $(AspNetCoreSharedFxRootUrl) $(DownloadedAspNetCoreSharedFxInstallerFileName) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) + $(AspNetCoreSharedFxRootUrl) $(DownloadedAspNetCoreSharedFxWixLibFileName) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) + $(AspNetCoreSharedFxRootUrl) $(DownloadedAspNetCoreV2ModuleInstallerFileName) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) - $(AspNetCoreSharedFxRootUrl) + $(AspNetCoreSharedFxRootUrl) $(AspNetCoreSharedFxBaseRuntimeVersionFileName) @@ -332,14 +346,14 @@ - $(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopBlobVersion) + $(WinFormsAndWpfSharedFxRootUrl) $(WinFormsAndWpfSharedFxArchiveFileName) shared/Microsoft.WindowsDesktop.App - $(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopBlobVersion) + $(WinFormsAndWpfSharedFxRootUrl) $(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName) @@ -380,7 +394,7 @@ For example, the dotnetbuilds uri for 'file:///vmr/dotnet2/artifacts/obj/x64/Release/blob-feed/assets//aspnetcore_base_runtime.version' would end up 'https://dotnetbuilds.blob.core.windows.net/public//dotnet-runtime-8.0.0-rc.1.23381.3-centos.8-x64.tar.gz'. This is missing the runtime version number directory. --> - + %(ComponentToDownload.ShouldDownload) @@ -502,7 +516,7 @@ + Condition="'$(DotNetBuildSourceOnly)' == 'true'"> diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 5acc61c19412..41d2c7820370 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/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets index 9cab8a0a9f5d..9886c88c8fe2 100644 --- a/src/redist/targets/GeneratePKG.targets +++ b/src/redist/targets/GeneratePKG.targets @@ -145,7 +145,7 @@ Inputs="@(GenerateSdkPkgInputs)" Outputs="$(SdkPKGInstallerFile)" DependsOnTargets="GenerateLayout;SetupPkgInputsOutputs" - Condition=" '$(OSName)' == 'osx' and '$(DotNetBuildFromSource)' != 'true' "> + Condition=" '$(OSName)' == 'osx' and '$(DotNetBuildSourceOnly)' != 'true' "> @@ -197,7 +197,7 @@ Inputs="@(GenerateSdkProductArchiveInputs)" Outputs="$(CombinedFrameworkSdkHostPKGInstallerFile)" DependsOnTargets="GenerateSdkPkg" - Condition=" '$(OSName)' == 'osx' and '$(DotNetBuildFromSource)' != 'true' "> + Condition=" '$(OSName)' == 'osx' and '$(DotNetBuildSourceOnly)' != 'true' ">