diff --git a/Directory.Build.props b/Directory.Build.props index 5d0198439..c40c8555e 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 c1341c290..9e4078adf 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 045c6c4ff..ffb771de0 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 - e856cdde17d1462592ee96ebac7dbaa7d1763ba1 + 6cd8a235fa93f02ae0400a78625dab312c4642f2 - + https://github.com/dotnet/windowsdesktop - e856cdde17d1462592ee96ebac7dbaa7d1763ba1 + 6cd8a235fa93f02ae0400a78625dab312c4642f2 - + https://github.com/dotnet/windowsdesktop - e856cdde17d1462592ee96ebac7dbaa7d1763ba1 + 6cd8a235fa93f02ae0400a78625dab312c4642f2 - + https://github.com/dotnet/windowsdesktop - e856cdde17d1462592ee96ebac7dbaa7d1763ba1 + 6cd8a235fa93f02ae0400a78625dab312c4642f2 - + https://github.com/dotnet/runtime - 1b1d26ac74e374309fb101382026ba0480d3821d + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/runtime - 1b1d26ac74e374309fb101382026ba0480d3821d + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/runtime - 1b1d26ac74e374309fb101382026ba0480d3821d + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/runtime - 1b1d26ac74e374309fb101382026ba0480d3821d + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/runtime - 1b1d26ac74e374309fb101382026ba0480d3821d + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 1b1d26ac74e374309fb101382026ba0480d3821d + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/runtime - 1b1d26ac74e374309fb101382026ba0480d3821d + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/aspnetcore - f26b79eb34d13648bedc5ec98e2151f8c55db978 + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - f26b79eb34d13648bedc5ec98e2151f8c55db978 + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - f26b79eb34d13648bedc5ec98e2151f8c55db978 + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - f26b79eb34d13648bedc5ec98e2151f8c55db978 + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - f26b79eb34d13648bedc5ec98e2151f8c55db978 + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - f26b79eb34d13648bedc5ec98e2151f8c55db978 + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - f26b79eb34d13648bedc5ec98e2151f8c55db978 + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/aspnetcore - f26b79eb34d13648bedc5ec98e2151f8c55db978 + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/sdk - 96b291f9efbe1277659187427ce38d3fe111e4d3 + e0a3cd9377fb9decba91d8cbcd50f2fe6107b12c - + https://github.com/dotnet/sdk - 96b291f9efbe1277659187427ce38d3fe111e4d3 + e0a3cd9377fb9decba91d8cbcd50f2fe6107b12c - + https://github.com/dotnet/sdk - 96b291f9efbe1277659187427ce38d3fe111e4d3 + e0a3cd9377fb9decba91d8cbcd50f2fe6107b12c - + https://github.com/dotnet/sdk - 96b291f9efbe1277659187427ce38d3fe111e4d3 + e0a3cd9377fb9decba91d8cbcd50f2fe6107b12c - + https://github.com/dotnet/sdk - 96b291f9efbe1277659187427ce38d3fe111e4d3 + e0a3cd9377fb9decba91d8cbcd50f2fe6107b12c @@ -144,75 +144,75 @@ - + https://github.com/dotnet/winforms - 852f7ef241402c2336e085c82dca6f70b7400c21 + 822e882f4080b6197234cd82ad0d2f2a485a4f35 - + https://github.com/dotnet/wpf - 1b673503bc443f8272c50c4c14493fadb08a376f + a86dc342ee4a97a9d36c1e55503e5d7ae7eb8b80 - + https://github.com/dotnet/fsharp - f2a6810476e1b589bcf56eb5f377c5214c509bc6 + 02bb351b606468bce98688fccda9d0c8adcd964d - + https://github.com/dotnet/fsharp - f2a6810476e1b589bcf56eb5f377c5214c509bc6 + 02bb351b606468bce98688fccda9d0c8adcd964d - + https://github.com/microsoft/vstest - c13b1f9b2bb6acbb9785de003be3d9ace33c9d7c + 48d8e778c871315db0bad221b00f4843b06242c3 - + https://github.com/microsoft/vstest - c13b1f9b2bb6acbb9785de003be3d9ace33c9d7c + 48d8e778c871315db0bad221b00f4843b06242c3 - + https://github.com/dotnet/runtime - 1b1d26ac74e374309fb101382026ba0480d3821d + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/roslyn - fb78dcb1e08e073f2e13631d583f51c05c64c4d9 + 2bfcc497086de48b15861bb56407324facef4c4a - + https://github.com/dotnet/roslyn - fb78dcb1e08e073f2e13631d583f51c05c64c4d9 + 2bfcc497086de48b15861bb56407324facef4c4a - + https://github.com/dotnet/msbuild - aa5b55280b9e4ba92aaf39a650b94227a44bf834 + d4cb14fe4d2e6df0327308feab18ccbb2046246c - + https://github.com/dotnet/msbuild - aa5b55280b9e4ba92aaf39a650b94227a44bf834 + d4cb14fe4d2e6df0327308feab18ccbb2046246c - + https://github.com/nuget/nuget.client - 8b658e2eee6391936887b9fd1b39f7918d16a9cb + 63958aab19b7120862ff55eac32ab6a155596a59 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 8afd92448d03a80001c9cac5f2acb53b336263a4 + 2d3f1fe4807a21879cedba9d3fde8cd329fb17f2 - + https://github.com/dotnet/emsdk - 8afd92448d03a80001c9cac5f2acb53b336263a4 + 2d3f1fe4807a21879cedba9d3fde8cd329fb17f2 diff --git a/eng/Versions.props b/eng/Versions.props index 7dfb34adf..dab54084a 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.24118.1 + 9.0.0-preview.2.24122.2 - 9.0.0-preview.2.24119.1 + 9.0.0-preview.2.24122.1 @@ -77,49 +77,49 @@ - 9.0.0-preview.2.24120.6 - 9.0.0-preview.2.24120.6 - 9.0.0-preview.2.24120.6 - 9.0.0-preview.2.24120.6 - 9.0.0-preview.2.24120.6 - 9.0.0-preview.2.24120.6 - 9.0.0-preview.2.24120.6 + 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.24121.6 - 9.0.100-preview.2.24121.6 - 9.0.100-preview.2.24121.6 + 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.24120.7 + 4.10.0-2.24122.3 - 9.0.0-preview.2.24120.11 + 9.0.0-preview.2.24123.1 - 9.0.0-preview.2.24120.11 - 9.0.0-preview.2.24120.11 - 9.0.0-preview.2.24120.11 - 9.0.0-preview.2.24120.11 - 9.0.0-preview.2.24120.11 + 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.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.24122.1 + 9.0.0-preview.2.24122.1 + 9.0.0-preview.2.24122.1 + 9.0.0-preview.2.24122.1 @@ -131,7 +131,7 @@ - 6.10.0-preview.2.32 + 6.10.0-preview.2.41 @@ -250,7 +250,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24119-01 + 17.10.0-preview-24120-01 9.0.0-alpha.1.24058.10 9.0.0-preview.24057.2 @@ -266,7 +266,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.2.24114.5 + 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 d25e605c0..16d676186 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 e53063ee0..de9aa765d 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 893a96111..e3862f0e9 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 cd17755d5..f4352ac20 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 c9a997e7a..216830039 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 @@ -189,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 979698d82..58dbd7288 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 b35a7aa50..000000000 --- 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 77f9a7ca8..0a2a25dc8 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 7830ecbde..61bf69783 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,19 +28,6 @@ $(IntermediateSymbolsRootDir)$(RepositoryName) - - - - - - - - - - - - - @@ -53,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" /> @@ -268,11 +286,12 @@ - + - <_DependentProject Include="@(RepositoryReference -> '%(Identity).proj')" /> + <_DependentProject Include="@(TransitiveRepositoryReference -> '%(Identity).proj')" /> @@ -397,21 +414,21 @@ - $(ArtifactsNonShippingPackagesDir) - $(ReferencePackagesDir) + $(RepoArtifactsNonShippingPackagesDir) + $(ReferencePackagesDir) - $(ArtifactsShippingPackagesDir) - $(ReferencePackagesDir) + $(RepoArtifactsShippingPackagesDir) + $(ReferencePackagesDir) - - - + + $(ArtifactsAssetsDir) + $(ReferenceAssetsDir) + + @@ -505,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) @@ -693,4 +710,76 @@ + + + + <_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 59bd8e296..24dddd442 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 c4068fe7b..9cb33b7c4 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 a16b2412a..28ba676c0 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 85976198a..7fd4eb25f 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 c4068fe7b..9cb33b7c4 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 0de74d679..f09de2ca8 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 df9c06326..a210d9c4b 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 9418953b7..91744a768 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 bac7243b5..2749c6f02 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 541b3205d..518ca8aad 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,14 +10,15 @@ $(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) @@ -27,27 +27,40 @@ $(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 bd8378b0a..a9219d82c 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 a0797bcb8..b29f0595e 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 d96d864c7..000000000 --- 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 800961ade..99eca651e 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 23819f499..eee275a05 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 5f1c34aa5..dfbeb7102 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 aa5b32962..3dcaa1eb5 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 25c6f1b9c..6d9422b61 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 69c6a2826..d307692ac 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 a391c4cd6..c86415ade 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 7c3650d74..c7bb4961a 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 87026a8e9..3f0451a38 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 c4068fe7b..9cb33b7c4 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 999d5a167..9677f1100 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 a272afd4f..3013d77fd 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 c228f58a6..327d8aea1 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/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 000000000..4752e4240 --- /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 ae3b5241e..9f9b4b415 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 000000000..ab49fefaa --- /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/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 938dba427..812e0d6bd 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 80c5be98d..17b27a104 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 diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 9a6e21871..8006710cd 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 b17e885e4..fbe03b6e4 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 760318166..a13289946 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 4121ddb9c..4a996f927 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 814abbe71..ac662ab94 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 6c5a7a912..bd36c5e06 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/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets index 9cab8a0a9..9886c88c8 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' ">