diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e962a714..0a904a75e 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 - e9216a8057d1837fc2344fa36703ae8f9b49cc24 + 779fc998f3d71a33a0ed59b4acf849b45e9659a2 - + https://github.com/dotnet/windowsdesktop - e9216a8057d1837fc2344fa36703ae8f9b49cc24 + 779fc998f3d71a33a0ed59b4acf849b45e9659a2 - + https://github.com/dotnet/windowsdesktop - e9216a8057d1837fc2344fa36703ae8f9b49cc24 + 779fc998f3d71a33a0ed59b4acf849b45e9659a2 - + https://github.com/dotnet/windowsdesktop - e9216a8057d1837fc2344fa36703ae8f9b49cc24 + 779fc998f3d71a33a0ed59b4acf849b45e9659a2 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + e612bf4d0b6f08623092902c34a504e932388664 @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/sdk - f4c11814251c66b510761dee510b9b16c956fe50 + 722cfe0512e8ef858287d3dcaf0c5e88ed336330 - + https://github.com/dotnet/sdk - f4c11814251c66b510761dee510b9b16c956fe50 + 722cfe0512e8ef858287d3dcaf0c5e88ed336330 - + https://github.com/dotnet/sdk - f4c11814251c66b510761dee510b9b16c956fe50 + 722cfe0512e8ef858287d3dcaf0c5e88ed336330 - + https://github.com/dotnet/sdk - f4c11814251c66b510761dee510b9b16c956fe50 + 722cfe0512e8ef858287d3dcaf0c5e88ed336330 - + https://github.com/dotnet/sdk - f4c11814251c66b510761dee510b9b16c956fe50 + 722cfe0512e8ef858287d3dcaf0c5e88ed336330 @@ -144,56 +144,56 @@ - + https://github.com/dotnet/winforms - 9c9b2e06a998f65638053fdd32cbd65c4cd1a64f + 7b7e9b0f5cf667be3326ed8cf11be1f825da672b - + https://github.com/dotnet/wpf - 9ef9cfb01e493f617202fd47a09c3403327933a4 + 69b072ec137ebf5b2efa9d7ffa40183d70625ae2 - + https://github.com/dotnet/fsharp - 4a394198efadc455334ae272954ece372aea4de2 + 20b263ab495669df94b309fce12584b207dc765c - + https://github.com/dotnet/fsharp - 4a394198efadc455334ae272954ece372aea4de2 + 20b263ab495669df94b309fce12584b207dc765c - + https://github.com/microsoft/vstest - 6957756d70d6ade74e239a38ad709db5cb39fe0d + 1cd0d8998250d36c95ed65a76304ef5d1b33e98f - + https://github.com/microsoft/vstest - 6957756d70d6ade74e239a38ad709db5cb39fe0d + 1cd0d8998250d36c95ed65a76304ef5d1b33e98f - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/roslyn - 919d4dbfb0dffb35a702417e28ceea652d248bc6 + 70c173446a3b354fb586e51301fc79aa809fafb4 - + https://github.com/dotnet/roslyn - 919d4dbfb0dffb35a702417e28ceea652d248bc6 + 70c173446a3b354fb586e51301fc79aa809fafb4 - + https://github.com/dotnet/msbuild - bf82a1313390df2692c23206e0846b205398188b + fc88a31e448201028ca50f890fea3a9878d7c534 - + https://github.com/dotnet/msbuild - bf82a1313390df2692c23206e0846b205398188b + fc88a31e448201028ca50f890fea3a9878d7c534 @@ -205,14 +205,14 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - e4c6eabba09c9d8c4d1bfb40511cb9d494fb0626 + 5b7beea1daa64d283d62d52a0027b13ee9484ff6 - + https://github.com/dotnet/emsdk - e4c6eabba09c9d8c4d1bfb40511cb9d494fb0626 + 5b7beea1daa64d283d62d52a0027b13ee9484ff6 @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services 0e9abfee048404d9b994fc64235b42216ce68dad - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 diff --git a/eng/Versions.props b/eng/Versions.props index 0f5e03034..6490a6a82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24176.6 + 9.0.0-beta.24177.2 @@ -47,11 +47,11 @@ - 9.0.0-preview.4.24176.1 + 9.0.0-preview.4.24177.4 - 9.0.0-preview.4.24177.1 + 9.0.0-preview.4.24177.5 @@ -67,49 +67,49 @@ - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 0.2.0 - 9.0.100-preview.4.24177.10 - 9.0.100-preview.4.24177.10 - 9.0.100-preview.4.24177.10 + 9.0.100-preview.4.24178.27 + 9.0.100-preview.4.24178.27 + 9.0.100-preview.4.24178.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24175.2 + 4.11.0-1.24177.10 - 9.0.0-preview.4.24176.12 + 9.0.0-preview.4.24178.3 - 9.0.0-preview.4.24176.12 - 9.0.0-preview.4.24176.12 - 9.0.0-preview.4.24176.12 - 9.0.0-preview.4.24176.12 - 9.0.0-preview.4.24176.12 + 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.3 2.1.0 - 9.0.0-preview.4.24177.1 - 9.0.0-preview.4.24177.1 - 9.0.0-preview.4.24177.1 - 9.0.0-preview.4.24177.1 + 9.0.0-preview.4.24178.2 + 9.0.0-preview.4.24178.2 + 9.0.0-preview.4.24178.2 + 9.0.0-preview.4.24178.2 @@ -210,7 +210,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24170-01 + 17.10.0-release-24177-07 9.0.0-alpha.1.24058.10 9.0.0-preview.24176.1 @@ -226,7 +226,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.4.24176.1 + 9.0.0-preview.4.24176.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index aeab74edd..11438c14b 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -38,7 +38,7 @@ jobs: echo "Dotnet-dotnet build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results" - installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer ,,g") + installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --query "[?contains(@, 'installer')]" --output tsv | sed "s,installer ,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) if [[ -z "$installer_build" ]]; then echo "Could not find a build of installer for commit '$installer_sha'" diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index d396d75b0..6e884c1dc 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -93,8 +93,15 @@ parameters: jobs: - job: ${{ parameters.buildName }}_${{ parameters.architecture }} - timeoutInMinutes: 150 pool: ${{ parameters.pool }} + + # Currently, CodeQL slows the build down too much + # https://github.com/dotnet/source-build/issues/4276 + ${{ if and(parameters.isBuiltFromVmr, startswith(parameters.buildName, 'Windows'), eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + timeoutInMinutes: 360 + ${{ else }}: + timeoutInMinutes: 150 + ${{ if ne(parameters.reuseBuildArtifactsFrom, '') }}: # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. # The build shortcuts when stage 1 build fails and doesn't produce the SDK. @@ -103,7 +110,7 @@ jobs: variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: AzureDevOps-Artifact-Feeds-Pats - - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal'), not(startswith(parameters.vmrBranch, 'internal/release/')), not(eq(variables['Build.Reason'], 'PullRequest'))) }}: + - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal'), not(startswith(parameters.vmrBranch, 'internal/release/')), ne(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNetBot-GitHub - ${{ else }}: - name: BotAccount-dotnet-bot-repo-PAT diff --git a/global.json b/global.json index fd277162f..90bced43b 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24176.6", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24176.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24177.2" } } diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs index 32abcae71..3f98cedae 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs @@ -4,6 +4,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; +using Microsoft.DotNet.UnifiedBuild.Tasks; using System; using System.Collections.Generic; using System.IO; diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index b54a33934..c8eca61db 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -54,7 +54,6 @@ - diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index bf77ef870..6fa87fb0f 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -24,13 +24,13 @@ - + diff --git a/src/SourceBuild/content/repo-projects/roslyn.proj b/src/SourceBuild/content/repo-projects/roslyn.proj index dfbeb7102..398f2cda1 100644 --- a/src/SourceBuild/content/repo-projects/roslyn.proj +++ b/src/SourceBuild/content/repo-projects/roslyn.proj @@ -17,6 +17,7 @@ $(BuildArgs) $(FlagParameterPrefix)officialSkipApplyOptimizationData true $(BuildArgs) $(FlagParameterPrefix)officialSourceBranchName placeholder $(BuildArgs) $(FlagParameterPrefix)officialVisualStudioDropAccessToken placeholder + $(BuildArgs) /p:TargetRid=$(TargetRid) $(BuildArgs) /p:TreatWarningsAsErrors=false $(BuildArgs) /p:ApplyPartialNgenOptimization=false $(BuildArgs) /p:EnablePartialNgenOptimization=false @@ -24,6 +25,8 @@ $(BuildArgs) /p:UsingToolMicrosoftNetCompilers=false + + $(BuildArgs) /p:EnableNgenOptimization=false diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs index 81f3943d2..eab79f2b7 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -24,8 +24,7 @@ namespace Microsoft.DotNet.Cli.Build AddFolder(sb, @"MSBuildSdkResolver", - @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver", - ngenAssemblies: true); + @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver"); AddFolder(sb, @"msbuildExtensions", @@ -40,7 +39,7 @@ namespace Microsoft.DotNet.Cli.Build return true; } - private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir, bool ngenAssemblies = false) + private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir) { string sourceFolder = Path.Combine(MSBuildExtensionsLayoutDirectory, relativeSourcePath); var files = Directory.GetFiles(sourceFolder) @@ -56,16 +55,7 @@ namespace Microsoft.DotNet.Cli.Build { sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\"); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); - sb.Append('"'); - - if (ngenAssemblies && file.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) - { - sb.Append(@" vs.file.ngenApplications=""[installDir]\Common7\IDE\vsn.exe"""); - sb.Append(@" vs.file.ngenApplications=""[installDir]\MSBuild\Current\Bin\MSBuild.exe"""); - sb.Append(" vs.file.ngenArchitecture=all"); - } - - sb.AppendLine(); + sb.AppendLine("\""); } sb.AppendLine(); @@ -77,7 +67,6 @@ namespace Microsoft.DotNet.Cli.Build string newRelativeSourcePath = Path.Combine(relativeSourcePath, subfolderName); string newSwrInstallDir = Path.Combine(swrInstallDir, subfolderName); - // Don't propagate ngenAssemblies to subdirectories. AddFolder(sb, newRelativeSourcePath, newSwrInstallDir); } }