From 046b4d48af504f111606345f7e9cf67141e4a014 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 12:32:58 +0530 Subject: [PATCH 01/46] [main] Source code updates from dotnet/dotnet (#11050) * Update dependencies from https://github.com/dotnet/dotnet build 279079 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25411.109 -> 10.0.0-beta.25413.101) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25411.109 -> 10.0.0-rc.1.25413.101) * Backflow from https://github.com/dotnet/dotnet / 5088919 build 279336 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 279336 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25413.101 -> 10.0.0-beta.25414.103) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25413.101 -> 10.0.0-rc.1.25414.103) * Update dependencies from https://github.com/dotnet/dotnet build 279843 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25414.103 -> 10.0.0-beta.25418.105) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25414.103 -> 10.0.0-rc.1.25418.105) Added Dependencies: System.Private.Windows.Core.TestUtilities (Version 10.0.0-rc.1.25418.105) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 ++++----- eng/Version.Details.xml | 94 +++++++++---------- eng/common/SetupNugetSources.ps1 | 4 +- eng/common/SetupNugetSources.sh | 4 +- eng/common/core-templates/job/job.yml | 6 +- eng/common/core-templates/job/onelocbuild.yml | 6 +- .../job/publish-build-assets.yml | 10 +- .../core-templates/jobs/codeql-build.yml | 2 +- eng/common/core-templates/jobs/jobs.yml | 2 + .../core-templates/post-build/post-build.yml | 8 +- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 +-- .../core-templates/steps/generate-sbom.yml | 2 +- .../steps/install-microbuild.yml | 47 ++++++---- .../core-templates/steps/publish-logs.yml | 14 +-- .../steps/source-index-stage1-publish.yml | 2 +- eng/common/generate-locproject.ps1 | 49 ++++++++-- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 +- eng/common/tools.ps1 | 6 +- global.json | 8 +- 23 files changed, 193 insertions(+), 139 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 2c23d8cc4c5..141354ac9a5 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,30 +7,30 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25411.109 - 10.0.0-beta.25411.109 - 10.0.0-beta.25411.109 - 10.0.0-beta.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 + 10.0.0-beta.25418.105 + 10.0.0-beta.25418.105 + 10.0.0-beta.25418.105 + 10.0.0-beta.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25418.105 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93c897a685f..34848e19725 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,100 +1,96 @@ - + - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 - - - https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + 5c3434d8b831745673c31e186906f463e1036301 @@ -105,5 +101,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c + + https://github.com/dotnet/dotnet + 5c3434d8b831745673c31e186906f463e1036301 + diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71ee2..792b60b49d4 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) # diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 4604b61b032..facb415ca6f 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index d9013251542..5ce51840619 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -163,7 +163,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -174,7 +174,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -218,7 +218,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 8bf7d23355b..c5788829a87 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -103,7 +103,7 @@ jobs: - task: CopyFiles@2 displayName: Copy LocProject.json inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/Localize/' Contents: 'LocProject.json' TargetFolder: '$(Build.ArtifactStagingDirectory)/loc' condition: ${{ parameters.condition }} diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index d5303229c97..348cd16376f 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -38,6 +38,8 @@ parameters: # Optional: A minimatch pattern for the asset manifests to publish to BAR assetManifestsPattern: '*/manifests/**/*.xml' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -78,7 +80,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true @@ -117,7 +119,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} @@ -137,7 +139,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -177,7 +179,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion 3 diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index 693b00b3704..dbc14ac580a 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -24,7 +24,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index 2f992b2c6ec..b637cb6e948 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,7 @@ parameters: artifacts: {} is1ESPipeline: '' + repositoryAlias: self # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -114,3 +115,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a151fd811e3..f6f87fe5c67 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -154,7 +154,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: @@ -208,7 +208,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: /eng/common/core-templates/steps/publish-logs.yml @@ -258,7 +258,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -313,7 +313,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980dbe..a7abd58c4bb 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bffc3..4085512b690 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 44a9636cdff..c05f6502797 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 10.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index da30e67bc34..d6b9878f54d 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -12,6 +12,7 @@ parameters: # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. microbuildUseESRP: true # Location of the MicroBuild output folder + # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly. microBuildOutputFolder: '$(Build.SourcesDirectory)' continueOnError: false @@ -46,17 +47,19 @@ steps: displayName: 'Validate ESRP usage (Non-Windows)' condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + # Two different MB install steps. This is due to not being able to use the agent OS during + # YAML expansion, and Windows vs. Linux/Mac uses different service connections. However, + # we can avoid including the MB install step if not enabled at all. This avoids a bunch of + # extra pipeline authorizations, since most pipelines do not sign on non-Windows. - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin + displayName: Install MicroBuild plugin (Windows) inputs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json ${{ if eq(parameters.microbuildUseESRP, true) }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - azureSubscription: 'MicroBuild Signing Task (DevDiv)' - useEsrpCli: true - ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea ${{ else }}: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca @@ -65,16 +68,24 @@ steps: MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} - condition: and( - succeeded(), - or( - and( - eq(variables['Agent.Os'], 'Windows_NT'), - in(variables['_SignType'], 'real', 'test') - ), - and( - ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }}, - ne(variables['Agent.Os'], 'Windows_NT'), - eq(variables['_SignType'], 'real') - ) - )) + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) + + - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin (non-Windows) + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ${{ else }}: + ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc + env: + TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index de24d0087c5..10f825e270a 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PowerShell@2 displayName: Redact Logs inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) - arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -44,7 +44,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' condition: always() diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index c2917c1efc1..75600735f17 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -20,7 +20,7 @@ steps: # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) -- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output +- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: "Source Index: Process Binlog into indexable sln" - ${{ if and(ne(parameters.runAsPublic, 'true'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 524aaa57f2b..fa1cdc2b300 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -33,15 +33,27 @@ $jsonTemplateFiles | ForEach-Object { $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern +$wxlFilesV3 = @() +$wxlFilesV5 = @() $wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them if (-not $wxlFiles) { $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files if ($wxlEnFiles) { - $wxlFiles = @() - $wxlEnFiles | ForEach-Object { - $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" - $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $content = Get-Content $_.FullName -Raw + + # Split files on schema to select different parser settings in the generated project. + if ($content -like "*http://wixtoolset.org/schemas/v4/wxl*") + { + $wxlFilesV5 += Copy-Item $_.FullName -Destination $destinationFile -PassThru + } + elseif ($content -like "*http://schemas.microsoft.com/wix/2006/localization*") + { + $wxlFilesV3 += Copy-Item $_.FullName -Destination $destinationFile -PassThru + } + } } } @@ -114,7 +126,32 @@ $locJson = @{ CloneLanguageSet = "WiX_CloneLanguages" LssFiles = @( "wxl_loc.lss" ) LocItems = @( - $wxlFiles | ForEach-Object { + $wxlFilesV3 | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) + { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "WiX_CloneLanguages" + LssFiles = @( "P210WxlSchemaV4.lss" ) + LocItems = @( + $wxlFilesV5 | ForEach-Object { $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded0b..4bf4cf41bd7 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a8a94328745..92a0664f564 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a4b..f1311bbb1b3 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 7cbf668c22b..238fa0818f7 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -77,7 +77,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index d4cfd9ccd80..4920464cc4a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -544,7 +544,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') { $vswhereVersion = $GlobalJson.tools.vswhere } else { - $vswhereVersion = '2.5.2' + # keep this in sync with the VSWhereVersion in DefaultVersions.props + $vswhereVersion = '3.1.7' } $vsWhereDir = Join-Path $ToolsDir "vswhere\$vswhereVersion" @@ -552,7 +553,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir - Write-Host 'Downloading vswhere' + Write-Host 'Downloading vswhere $vswhereVersion' + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe }) diff --git a/global.json b/global.json index 9714f9dadd2..9e4e0e2478e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-preview.7.25372.107", + "version": "10.0.100-rc.1.25411.109", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "10.0.100-preview.7.25372.107", + "dotnet": "10.0.100-rc.1.25411.109", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCorePlatformsVersion)" @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25411.109", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25411.109", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25418.105", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25418.105", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 6c8a83b693e96e42ec7bcc8e0409e04548da5a19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Aug 2025 10:46:13 +0530 Subject: [PATCH 02/46] Update dependencies from https://github.com/dotnet/dotnet build 280037 (#11061) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25418.105 -> 10.0.0-beta.25419.104) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25418.105 -> 10.0.0-rc.1.25419.104) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- eng/common/sdk-task.ps1 | 3 +- eng/common/sdk-task.sh | 7 ++- global.json | 4 +- 5 files changed, 77 insertions(+), 71 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 141354ac9a5..65cd0e78cc7 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,30 +7,30 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25418.105 - 10.0.0-beta.25418.105 - 10.0.0-beta.25418.105 - 10.0.0-beta.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 + 10.0.0-beta.25419.104 + 10.0.0-beta.25419.104 + 10.0.0-beta.25419.104 + 10.0.0-beta.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 - 10.0.0-rc.1.25418.105 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25419.104 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34848e19725..f33329ce1be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,96 +1,96 @@ - + - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 @@ -101,9 +101,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 5c3434d8b831745673c31e186906f463e1036301 + 04752cb2abae96e13adee371bf45a334fc7a32d2 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index a9d2a2d2699..b62e132d32a 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -7,13 +7,14 @@ Param( [switch] $restore, [switch] $prepareMachine, [switch][Alias('nobl')]$excludeCIBinaryLog, + [switch]$noWarnAsError, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) $ci = $true $binaryLog = if ($excludeCIBinaryLog) { $false } else { $true } -$warnAsError = $true +$warnAsError = if ($noWarnAsError) { $false } else { $true } . $PSScriptRoot\tools.ps1 diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh index 2f83adc0269..0c92f81d74f 100755 --- a/eng/common/sdk-task.sh +++ b/eng/common/sdk-task.sh @@ -10,6 +10,7 @@ show_usage() { echo "Advanced settings:" echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" + echo " --noWarnAsError Do not warn as error echo "" echo "Command line arguments not listed above are passed thru to msbuild." } @@ -52,6 +53,7 @@ exclude_ci_binary_log=false restore=false help=false properties='' +warnAsError=true while (($# > 0)); do lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" @@ -73,6 +75,10 @@ while (($# > 0)); do exclude_ci_binary_log=true shift 1 ;; + --noWarnAsError) + warnAsError=false + shift 1 + ;; --help) help=true shift 1 @@ -85,7 +91,6 @@ while (($# > 0)); do done ci=true -warnAsError=true if $help; then show_usage diff --git a/global.json b/global.json index 9e4e0e2478e..e29804d1d92 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25418.105", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25418.105", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25419.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25419.104", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 8223378b6fdddd3ae4e0577e90d9953b5469f076 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:34:33 +0530 Subject: [PATCH 03/46] Update dependencies from https://github.com/dotnet/dotnet build 280214 (#11063) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25419.104 -> 10.0.0-beta.25420.121) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25419.104 -> 10.0.0-rc.1.25420.121) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 ++++----- eng/Version.Details.xml | 90 +++++++++---------- .../steps/source-index-stage1-publish.yml | 4 +- eng/common/tools.ps1 | 2 +- global.json | 4 +- 5 files changed, 72 insertions(+), 72 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 65cd0e78cc7..d6a76b28bf4 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,30 +7,30 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25419.104 - 10.0.0-beta.25419.104 - 10.0.0-beta.25419.104 - 10.0.0-beta.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 + 10.0.0-beta.25420.121 + 10.0.0-beta.25420.121 + 10.0.0-beta.25420.121 + 10.0.0-beta.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 - 10.0.0-rc.1.25419.104 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25420.121 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f33329ce1be..c708871a207 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,96 +1,96 @@ - + - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 @@ -101,9 +101,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 04752cb2abae96e13adee371bf45a334fc7a32d2 + c4dc56079d959dbdb7fc27ea8ad7f95194885923 diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index 75600735f17..e9a694afa58 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -1,6 +1,6 @@ parameters: - sourceIndexUploadPackageVersion: 2.0.0-20250425.2 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1 + sourceIndexUploadPackageVersion: 2.0.0-20250818.1 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json binlogPath: artifacts/log/Debug/Build.binlog diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4920464cc4a..06b44de7870 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -553,7 +553,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir - Write-Host 'Downloading vswhere $vswhereVersion' + Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe diff --git a/global.json b/global.json index e29804d1d92..4090ed9c499 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25419.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25419.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.121", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.121", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 20ed0120dae50dee312cddb5d9239821be72535b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 14:34:50 +0530 Subject: [PATCH 04/46] [main] Source code updates from dotnet/dotnet (#11087) * Backflow from https://github.com/dotnet/dotnet / 3e92251 build 281912 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 281912 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25420.121 -> 11.0.0-beta.25453.110) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25420.121 -> 10.0.0-rc.1.25453.110) Added Dependencies: Microsoft.Build.Framework, Microsoft.Build.Utilities.Core (Version 15.9.20) * Update dependencies from https://github.com/dotnet/dotnet build 282048 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25453.110 -> 11.0.0-beta.25454.102) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25453.110 -> 10.0.0-rc.1.25454.102) --------- Co-authored-by: dotnet-maestro[bot] --- build.sh | 2 +- eng/Build.props | 9 ++ eng/Tools.props | 2 +- eng/Version.Details.props | 49 +++++----- eng/Version.Details.xml | 98 ++++++++++--------- eng/Versions.props | 2 - eng/WpfArcadeSdk/tools/ApiCompat.targets | 1 + .../core-templates/steps/generate-sbom.yml | 2 +- eng/common/sdk-task.sh | 2 +- global.json | 8 +- ....NET.Sdk.WindowsDesktop.ArchNeutral.csproj | 4 + .../PresentationBuildTasks.csproj | 9 +- 12 files changed, 106 insertions(+), 82 deletions(-) create mode 100644 eng/Build.props diff --git a/build.sh b/build.sh index 8477d5af881..84a7478bfa5 100755 --- a/build.sh +++ b/build.sh @@ -13,4 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -"$scriptroot/eng/common/build.sh" --build --restore $@ +"$scriptroot/eng/common/build.sh" --restore --build $@ diff --git a/eng/Build.props b/eng/Build.props new file mode 100644 index 00000000000..25dd1f9d38b --- /dev/null +++ b/eng/Build.props @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/eng/Tools.props b/eng/Tools.props index 6d65666f935..e8cd72a378c 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -6,7 +6,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d6a76b28bf4..38908392650 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -1,4 +1,3 @@ - - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 + 15.9.20 + 15.9.20 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 10.0.0-preview.7.25317.2 + $(MicrosoftBuildFrameworkPackageVersion) + $(MicrosoftBuildUtilitiesCorePackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetCodeAnalysisPackageVersion) $(MicrosoftDotNetGenAPIPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c708871a207..62e360c1cfa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,96 +1,104 @@ - + - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 + + + https://github.com/dotnet/dotnet + 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + + + https://github.com/dotnet/dotnet + 520c71b5277fc1f72dbec14da03ca55205d6c8e5 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 @@ -101,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 diff --git a/eng/Versions.props b/eng/Versions.props index b4e81997d15..0f9facda358 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,8 +39,6 @@ - 15.9.20 - 15.9.20 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj index 0feda021e68..dd20b37919b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj @@ -1,6 +1,7 @@  net472;net10.0 + false true @@ -121,11 +122,11 @@ WindowsBase\MS\Internal\IO\Packaging\CompoundFile\ContainerUtilities.cs - - PresentationCore\MS\Internal\Media\XamlSerializationHelper.cs + + PresentationCore\MS\internal\Media\XamlSerializationHelper.cs - - PresentationCore\MS\Internal\Media\ParserStreamGeometryContext.cs + + PresentationCore\MS\internal\Media\ParserStreamGeometryContext.cs PresentationCore\System\Windows\Media\StreamGeometryContext.cs From 09a6800ac25e40fc636d22a3e78216840b386ba2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 11:05:36 +0530 Subject: [PATCH 05/46] [main] Source code updates from dotnet/dotnet (#11093) * Update dependencies from https://github.com/dotnet/dotnet build 282156 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25454.102 -> 11.0.0-beta.25455.101) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25454.102 -> 10.0.0-rc.1.25455.101) * Update dependencies from https://github.com/dotnet/dotnet build 282247 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25455.101 -> 11.0.0-beta.25457.103) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25455.101 -> 10.0.0-rc.1.25457.103) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 38908392650..b1a0dd00920 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25454.102 - 11.0.0-beta.25454.102 - 11.0.0-beta.25454.102 - 11.0.0-beta.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 + 11.0.0-beta.25457.103 + 11.0.0-beta.25457.103 + 11.0.0-beta.25457.103 + 11.0.0-beta.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 - 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62e360c1cfa..eedd10c4f1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 9303fa2ba817e93495ead20a93200dfeeff61b23 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f diff --git a/global.json b/global.json index 94220abbc67..c1606b0f252 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25454.102", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25454.102", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25457.103", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25457.103", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 348310ee9e945f9d70187e19e15132a1977983ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Sep 2025 11:01:10 +0530 Subject: [PATCH 06/46] [main] Source code updates from dotnet/dotnet (#11099) * Update dependencies from https://github.com/dotnet/dotnet build 282393 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25457.103 -> 11.0.0-beta.25458.105) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25457.103 -> 10.0.0-rc.1.25458.105) * Update dependencies from https://github.com/dotnet/dotnet build 282460 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25458.105 -> 11.0.0-beta.25458.110) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25458.105 -> 10.0.0-rc.1.25458.110) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b1a0dd00920..67f4fe6a85f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25457.103 - 11.0.0-beta.25457.103 - 11.0.0-beta.25457.103 - 11.0.0-beta.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 + 11.0.0-beta.25458.110 + 11.0.0-beta.25458.110 + 11.0.0-beta.25458.110 + 11.0.0-beta.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 - 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25458.110 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eedd10c4f1e..df3d62610c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 9d24e131fc9d315b1773a0e080d7b35a0cd8856f + 65be7a2848e933c83213260df83b9f5f83bf0714 diff --git a/global.json b/global.json index c1606b0f252..6616aa4c477 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25457.103", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25457.103", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25458.110", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25458.110", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 1a0e8e462431912ed44a2110ab6021d63ec98375 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 10:37:30 +0530 Subject: [PATCH 07/46] Update dependencies from https://github.com/dotnet/dotnet build 282722 (#11105) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25458.110 -> 11.0.0-beta.25460.106) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25458.110 -> 10.0.0-rc.1.25460.106) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 ++++----- eng/Version.Details.xml | 90 +++++++++---------- .../steps/source-index-stage1-publish.yml | 4 +- global.json | 4 +- 4 files changed, 71 insertions(+), 71 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 67f4fe6a85f..bd855feda7e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25458.110 - 11.0.0-beta.25458.110 - 11.0.0-beta.25458.110 - 11.0.0-beta.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 + 11.0.0-beta.25460.106 + 11.0.0-beta.25460.106 + 11.0.0-beta.25460.106 + 11.0.0-beta.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 - 10.0.0-rc.1.25458.110 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25460.106 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df3d62610c6..4f58ce1649e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 65be7a2848e933c83213260df83b9f5f83bf0714 + a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index e9a694afa58..eff4573c6e5 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -1,6 +1,6 @@ parameters: - sourceIndexUploadPackageVersion: 2.0.0-20250818.1 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1 + sourceIndexUploadPackageVersion: 2.0.0-20250906.1 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250906.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json binlogPath: artifacts/log/Debug/Build.binlog diff --git a/global.json b/global.json index 6616aa4c477..16ebd584887 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25458.110", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25458.110", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25460.106", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25460.106", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 77499b323d75f8197518fae303291eabf1a0e7aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 10:49:16 +0530 Subject: [PATCH 08/46] [main] Source code updates from dotnet/dotnet (#11116) * Update dependencies from https://github.com/dotnet/dotnet build 283019 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25460.106 -> 11.0.0-beta.25462.102) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25460.106 -> 10.0.0-rc.1.25462.102) * Backflow from https://github.com/dotnet/dotnet / 99827af build 283082 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 283082 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25462.102 -> 11.0.0-beta.25463.101) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25462.102 -> 10.0.0-rc.1.25463.101) * Update dependencies from https://github.com/dotnet/dotnet build 283253 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25463.101 -> 11.0.0-beta.25465.103) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25463.101 -> 10.0.0-rc.1.25465.103) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 ++++----- eng/Version.Details.xml | 90 +++++++++---------- .../job/publish-build-assets.yml | 9 +- eng/common/core-templates/jobs/jobs.yml | 2 + es-metadata.yml | 8 ++ global.json | 4 +- 6 files changed, 87 insertions(+), 70 deletions(-) create mode 100644 es-metadata.yml diff --git a/eng/Version.Details.props b/eng/Version.Details.props index bd855feda7e..4a3a1d2f1d5 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25460.106 - 11.0.0-beta.25460.106 - 11.0.0-beta.25460.106 - 11.0.0-beta.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 + 11.0.0-beta.25465.103 + 11.0.0-beta.25465.103 + 11.0.0-beta.25465.103 + 11.0.0-beta.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 - 10.0.0-rc.1.25460.106 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25465.103 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f58ce1649e..61b5e6229ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f + 7e80b42a4e753d4d2c1779edea60140a887b36ed diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 348cd16376f..37dff559fc1 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -40,6 +40,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -62,6 +64,11 @@ jobs: value: false # unconditional - needed for logs publishing (redactor tool version) - template: /eng/common/core-templates/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -124,7 +131,7 @@ jobs: /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} /p:MaestroApiEndpoint=https://maestro.dot.net - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index b637cb6e948..01ada747665 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -44,6 +44,7 @@ parameters: artifacts: {} is1ESPipeline: '' repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -116,3 +117,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/es-metadata.yml b/es-metadata.yml new file mode 100644 index 00000000000..3de9e85969e --- /dev/null +++ b/es-metadata.yml @@ -0,0 +1,8 @@ +schemaVersion: 0.0.1 +isProduction: true +accountableOwners: + service: 174e5b50-35f9-4c31-8d9e-0e1cf9efaf85 +routing: + defaultAreaPath: + org: devdiv + path: DevDiv\NET Fundamentals\NET Partners\WPF\Security\SDL diff --git a/global.json b/global.json index 16ebd584887..c3db677635d 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25460.106", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25460.106", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25465.103", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25465.103", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 49179bf8e303415233280d756ff6bb924d723ed8 Mon Sep 17 00:00:00 2001 From: Harshit <62823486+harshit7962@users.noreply.github.com> Date: Tue, 16 Sep 2025 17:14:01 +0530 Subject: [PATCH 09/46] Update Nuget.config to include .NET 11 paths (#11119) * Update Nuget.config to include .NET 11 paths * Remove .NET 7/8/9 configs * Revert the previous changes --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 627e2878975..645944d2f4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,6 +14,8 @@ + + From ee7cbb82652173e3a9f4e8feec155eb58eed5f4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 19:49:27 +0530 Subject: [PATCH 10/46] [main] Update dependencies from dnceng/internal/dotnet-wpf-int (#11109) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20250911.6 Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-preview.7.25317.2 -> To Version 10.0.0-rc.1.25461.6 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20250916.1 On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-preview.7.25317.2 -> To Version 10.0.0-rc.1.25466.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4a3a1d2f1d5..4e20dbf7599 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25465.103 10.0.0-rc.1.25465.103 - 10.0.0-preview.7.25317.2 + 10.0.0-rc.1.25466.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61b5e6229ee..830e6de89a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 7e80b42a4e753d4d2c1779edea60140a887b36ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 8a6c1d81657ef04c040f598cafacf8f5a33abda2 + 3567f4b428acc1a49fda38d150415482cc916dd8 https://github.com/dotnet/dotnet From 519468037f9b797440548c4d744fc7807573026f Mon Sep 17 00:00:00 2001 From: Harshit <62823486+harshit7962@users.noreply.github.com> Date: Thu, 18 Sep 2025 18:03:43 +0530 Subject: [PATCH 11/46] Bump up lang version to 14 (#11127) --- eng/WpfArcadeSdk/Sdk/Sdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props index 44eefc48a09..7a6cf353782 100644 --- a/eng/WpfArcadeSdk/Sdk/Sdk.props +++ b/eng/WpfArcadeSdk/Sdk/Sdk.props @@ -15,7 +15,7 @@ $(WpfArcadeSdkToolsDir)GenXmlStringTable.pl preview - 12 + 14 true true From f7ebd69146f3ec9b771e92c13250efa99a65a26c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 10:48:50 +0530 Subject: [PATCH 12/46] Update dependencies from https://github.com/dotnet/dotnet build 283489 (#11121) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25465.103 -> 11.0.0-beta.25466.104) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25465.103 -> 10.0.0-rc.1.25466.104) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4e20dbf7599..c5fc13cd068 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25465.103 - 11.0.0-beta.25465.103 - 11.0.0-beta.25465.103 - 11.0.0-beta.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 + 11.0.0-beta.25466.104 + 11.0.0-beta.25466.104 + 11.0.0-beta.25466.104 + 11.0.0-beta.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 - 10.0.0-rc.1.25465.103 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25466.104 10.0.0-rc.1.25466.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 830e6de89a2..dbe0b1eb06d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 3567f4b428acc1a49fda38d150415482cc916dd8 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 7e80b42a4e753d4d2c1779edea60140a887b36ed + c0d13804f97528f7b3750ca31846f83c4617a451 diff --git a/global.json b/global.json index c3db677635d..ff581758a90 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25465.103", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25465.103", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25466.104", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25466.104", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 7c843294170ea33e094dadcadea914c865709a03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Sep 2025 10:47:42 +0530 Subject: [PATCH 13/46] [main] Source code updates from dotnet/dotnet (#11138) * Backflow from https://github.com/dotnet/dotnet / 9f9f90c build 284210 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 284210 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25466.104 -> 11.0.0-beta.25472.101) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25466.104 -> 10.0.0-rc.1.25472.101) * Update dependencies from https://github.com/dotnet/dotnet build 284343 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25472.101 -> 11.0.0-beta.25473.107) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25472.101 -> 10.0.0-rc.1.25473.107) --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 1 + eng/Version.Details.props | 44 ++++++++-------- eng/Version.Details.xml | 90 ++++++++++++++++---------------- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 2 +- eng/common/SetupNugetSources.sh | 2 +- global.json | 4 +- 7 files changed, 73 insertions(+), 72 deletions(-) diff --git a/NuGet.config b/NuGet.config index 645944d2f4a..ed8e4a9cc71 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c5fc13cd068..61653434e9b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25466.104 - 11.0.0-beta.25466.104 - 11.0.0-beta.25466.104 - 11.0.0-beta.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 + 11.0.0-beta.25473.107 + 11.0.0-beta.25473.107 + 11.0.0-beta.25473.107 + 11.0.0-beta.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 - 10.0.0-rc.1.25466.104 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25473.107 10.0.0-rc.1.25466.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbe0b1eb06d..a7d16fab4b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 3567f4b428acc1a49fda38d150415482cc916dd8 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - c0d13804f97528f7b3750ca31846f83c4617a451 + 77d8896addbd65ffbe48dc39dcf912843fcf7727 diff --git a/eng/Versions.props b/eng/Versions.props index 0f9facda358..849add1d330 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 9.0.0-preview-20241010.1 + 10.0.0-preview-20250912.1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 792b60b49d4..9445c314325 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } -$dotnetVersions = @('5','6','7','8','9') +$dotnetVersions = @('5','6','7','8','9','10') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index facb415ca6f..ddf4efc81a4 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet3.1-internal-transport') fi -DotNetVersions=('5' '6' '7' '8' '9') +DotNetVersions=('5' '6' '7' '8' '9' '10') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; diff --git a/global.json b/global.json index ff581758a90..12b0e62fca7 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25466.104", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25466.104", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25473.107", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25473.107", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 70126b959b5c9c8f0da61641fdbf43bac361bec3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Sep 2025 10:47:19 +0530 Subject: [PATCH 14/46] Update dependencies from https://github.com/dotnet/dotnet build 284548 (#11145) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25473.107 -> 11.0.0-beta.25474.105) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25473.107 -> 10.0.0-rc.1.25474.105) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 61653434e9b..2ef4e1fff5f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25473.107 - 11.0.0-beta.25473.107 - 11.0.0-beta.25473.107 - 11.0.0-beta.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 + 11.0.0-beta.25474.105 + 11.0.0-beta.25474.105 + 11.0.0-beta.25474.105 + 11.0.0-beta.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 - 10.0.0-rc.1.25473.107 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25474.105 10.0.0-rc.1.25466.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7d16fab4b4..b43f177f1ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 3567f4b428acc1a49fda38d150415482cc916dd8 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 77d8896addbd65ffbe48dc39dcf912843fcf7727 + a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 diff --git a/global.json b/global.json index 12b0e62fca7..f54015ad728 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25473.107", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25473.107", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25474.105", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25474.105", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 6916c2ec25cd73de10ef3e67f6d1c735313cc0c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Sep 2025 10:41:59 +0530 Subject: [PATCH 15/46] Update dependencies from https://github.com/dotnet/dotnet build 284884 (#11149) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25474.105 -> 11.0.0-beta.25476.103) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25474.105 -> 10.0.0-rc.1.25476.103) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 2ef4e1fff5f..86cd2e84427 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25474.105 - 11.0.0-beta.25474.105 - 11.0.0-beta.25474.105 - 11.0.0-beta.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 + 11.0.0-beta.25476.103 + 11.0.0-beta.25476.103 + 11.0.0-beta.25476.103 + 11.0.0-beta.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 - 10.0.0-rc.1.25474.105 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25476.103 10.0.0-rc.1.25466.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b43f177f1ae..21c576955de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 3567f4b428acc1a49fda38d150415482cc916dd8 - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - a0ca1b9be44fcdffcc9f6a0d6a1f3dca62d1b3f3 + f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d diff --git a/global.json b/global.json index f54015ad728..0f18677b8bb 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25474.105", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25474.105", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25476.103", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25476.103", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 80f45802a3d1d4db95fa2ebd78b70adaba5bec57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Oct 2025 10:38:20 +0530 Subject: [PATCH 16/46] [main] Source code updates from dotnet/dotnet (#11154) * Update dependencies from https://github.com/dotnet/dotnet build 285151 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25476.103 -> 11.0.0-beta.25479.108) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25476.103 -> 10.0.0-rc.1.25479.108) * Update dependencies from https://github.com/dotnet/dotnet build 285219 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25479.108 -> 11.0.0-beta.25480.105) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25479.108 -> 10.0.0-rc.1.25480.105) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++----- eng/Version.Details.xml | 90 ++++++++++---------- eng/common/build.sh | 2 +- eng/common/darc-init.sh | 2 +- eng/common/dotnet-install.sh | 2 +- eng/common/dotnet.sh | 2 +- eng/common/internal-feed-operations.sh | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 +- global.json | 4 +- 11 files changed, 78 insertions(+), 78 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 86cd2e84427..6f9449eeb4d 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25476.103 - 11.0.0-beta.25476.103 - 11.0.0-beta.25476.103 - 11.0.0-beta.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 + 11.0.0-beta.25480.105 + 11.0.0-beta.25480.105 + 11.0.0-beta.25480.105 + 11.0.0-beta.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 10.0.0-rc.1.25466.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21c576955de..eba3b824709 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 3567f4b428acc1a49fda38d150415482cc916dd8 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 1be39deac0ebffe1635a70f2b24f454e850f7638 diff --git a/eng/common/build.sh b/eng/common/build.sh index 9767bb411a4..ec3e80d189e 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -92,7 +92,7 @@ runtime_source_feed='' runtime_source_feed_key='' properties=() -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" case "$opt" in -help|-h) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index e889f439b8d..9f5ad6b763b 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -5,7 +5,7 @@ darcVersion='' versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20' verbosity='minimal' -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in --darcversion) diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 7b9d97e3bd4..61f302bb677 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -18,7 +18,7 @@ architecture='' runtime='dotnet' runtimeSourceFeed='' runtimeSourceFeedKey='' -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in -version|-v) diff --git a/eng/common/dotnet.sh b/eng/common/dotnet.sh index 2ef68235675..f6d24871c1d 100755 --- a/eng/common/dotnet.sh +++ b/eng/common/dotnet.sh @@ -19,7 +19,7 @@ source $scriptroot/tools.sh InitializeDotNetCli true # install # Invoke acquired SDK with args if they are provided -if [[ $# > 0 ]]; then +if [[ $# -gt 0 ]]; then __dotnetDir=${_InitializeDotNetCli} dotnetPath=${__dotnetDir}/dotnet ${dotnetPath} "$@" diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh index 9378223ba09..6299e7effd4 100755 --- a/eng/common/internal-feed-operations.sh +++ b/eng/common/internal-feed-operations.sh @@ -100,7 +100,7 @@ operation='' authToken='' repoName='' -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in --operation) diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index a365194a938..ac5c69ffcac 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -30,7 +30,7 @@ [CmdletBinding(PositionalBinding = $false)] param( [string]$NuGetExePath, - [string]$PackageSource = "https://api.nuget.org/v3/index.json", + [string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", [string]$DownloadPath, [Parameter(ValueFromRemainingArguments = $true)] [string[]]$args diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index b62e132d32a..4655af7a2d8 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -68,7 +68,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 06b44de7870..4bc50bd568c 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0 - $defaultXCopyMSBuildVersion = '17.13.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16 + $defaultXCopyMSBuildVersion = '17.14.16' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 0f18677b8bb..d4676d4736b 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25476.103", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25476.103", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25480.105", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25480.105", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 205b41171c7a89e865ec619d8e3274368de2341e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 Oct 2025 10:35:22 +0530 Subject: [PATCH 17/46] [main] Source code updates from dotnet/dotnet (#11157) * Update dependencies from https://github.com/dotnet/dotnet build 285336 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25480.105 -> 11.0.0-beta.25480.112) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25480.105 -> 10.0.0-rc.1.25480.112) * Backflow from https://github.com/dotnet/dotnet / fe6b307 build 285582 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 285582 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25480.112 -> 11.0.0-beta.25502.108) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25480.112 -> 10.0.0-rc.1.25502.108) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 6f9449eeb4d..de193797596 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25480.105 - 11.0.0-beta.25480.105 - 11.0.0-beta.25480.105 - 11.0.0-beta.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 + 11.0.0-beta.25502.108 + 11.0.0-beta.25502.108 + 11.0.0-beta.25502.108 + 11.0.0-beta.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 - 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25502.108 10.0.0-rc.1.25466.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eba3b824709..d2bf0011f64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 3567f4b428acc1a49fda38d150415482cc916dd8 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 1be39deac0ebffe1635a70f2b24f454e850f7638 + fe6b307fbb764027be9a10b978063bd742763982 diff --git a/eng/Versions.props b/eng/Versions.props index 849add1d330..f812c5598ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 10.0.0-preview-20250912.1 + 10.0.0-preview-20250930.1 diff --git a/global.json b/global.json index d4676d4736b..48f24ef208f 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25480.105", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25480.105", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25502.108", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25502.108", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From ceb7698aac1404af3a58e0833e76f9a65bc5535c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 10:50:11 +0530 Subject: [PATCH 18/46] [main] Source code updates from dotnet/dotnet (#11159) * Update dependencies from https://github.com/dotnet/dotnet build 285662 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25502.108 -> 11.0.0-beta.25503.103) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25502.108 -> 10.0.0-rc.1.25503.103) * Update dependencies from https://github.com/dotnet/dotnet build 285790 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25503.103 -> 11.0.0-beta.25504.101) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25503.103 -> 10.0.0-rc.1.25504.101) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index de193797596..960409786ba 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25502.108 - 11.0.0-beta.25502.108 - 11.0.0-beta.25502.108 - 11.0.0-beta.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 + 11.0.0-beta.25504.101 + 11.0.0-beta.25504.101 + 11.0.0-beta.25504.101 + 11.0.0-beta.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 - 10.0.0-rc.1.25502.108 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25504.101 10.0.0-rc.1.25466.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2bf0011f64..804950f67ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 3567f4b428acc1a49fda38d150415482cc916dd8 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - fe6b307fbb764027be9a10b978063bd742763982 + 6d386b1208aec59da8295530c896e0f4c31bc953 diff --git a/global.json b/global.json index 48f24ef208f..2c25086b4d8 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25502.108", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25502.108", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25504.101", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25504.101", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From f090b7ead49b839a7e69d99ac9bcefce1b437879 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 10:21:54 +0530 Subject: [PATCH 19/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251007.2 (#11166) On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.1.25466.1 -> To Version 10.0.0-rc.1.25507.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 960409786ba..59f8aee5e49 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25504.101 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25466.1 + 10.0.0-rc.1.25507.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 804950f67ee..4a3febe1f2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 6d386b1208aec59da8295530c896e0f4c31bc953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 3567f4b428acc1a49fda38d150415482cc916dd8 + 429bc7133c19cfc7bca6dc56320bb1fe764d7a62 https://github.com/dotnet/dotnet From 785265288c76e15812c3f4eb0026bae1935fdfd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 10:23:17 +0530 Subject: [PATCH 20/46] [main] Source code updates from dotnet/dotnet (#11162) * Update dependencies from https://github.com/dotnet/dotnet build 285901 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25504.101 -> 11.0.0-beta.25506.102) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25504.101 -> 10.0.0-rc.1.25506.102) * Update dependencies from https://github.com/dotnet/dotnet build 286004 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25506.102 -> 11.0.0-beta.25507.102) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25506.102 -> 10.0.0-rc.1.25507.102) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 59f8aee5e49..f6e9e04dd95 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25504.101 - 11.0.0-beta.25504.101 - 11.0.0-beta.25504.101 - 11.0.0-beta.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 + 11.0.0-beta.25507.102 + 11.0.0-beta.25507.102 + 11.0.0-beta.25507.102 + 11.0.0-beta.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 - 10.0.0-rc.1.25504.101 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25507.102 10.0.0-rc.1.25507.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a3febe1f2c..cef0e442bd0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 429bc7133c19cfc7bca6dc56320bb1fe764d7a62 - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 6d386b1208aec59da8295530c896e0f4c31bc953 + d4a0a6c13e5c5b2faf06685125331de90a37943a diff --git a/global.json b/global.json index 2c25086b4d8..22a98c65976 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25504.101", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25504.101", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25507.102", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25507.102", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 346639f0dbd682da86d3caf1a80de2e2f91bae86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 11:28:19 +0530 Subject: [PATCH 21/46] [main] Source code updates from dotnet/dotnet (#11168) * Backflow from https://github.com/dotnet/dotnet / 3065a08 build 286257 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 286257 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25507.102 -> 11.0.0-beta.25508.102) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25507.102 -> 10.0.0-rc.1.25508.102) * Update dependencies from https://github.com/dotnet/dotnet build 286279 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25508.102 -> 11.0.0-beta.25508.109) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25508.102 -> 10.0.0-rc.1.25508.109) * Update dependencies from https://github.com/dotnet/dotnet build 286548 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25508.109 -> 11.0.0-beta.25510.104) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25508.109 -> 10.0.0-rc.1.25510.104) * Update dependencies from https://github.com/dotnet/dotnet build 286642 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25510.104 -> 11.0.0-beta.25511.101) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25510.104 -> 10.0.0-rc.1.25511.101) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 ++--- eng/Version.Details.xml | 90 ++++----- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 71 +++---- eng/common/SetupNugetSources.sh | 175 +++++++++++------- eng/common/core-templates/job/job.yml | 6 + .../steps/install-microbuild-impl.yml | 34 ++++ .../steps/install-microbuild.yml | 62 ++++--- eng/common/native/install-dependencies.sh | 2 + global.json | 4 +- 10 files changed, 288 insertions(+), 202 deletions(-) create mode 100644 eng/common/core-templates/steps/install-microbuild-impl.yml diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f6e9e04dd95..4c556233691 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25507.102 - 11.0.0-beta.25507.102 - 11.0.0-beta.25507.102 - 11.0.0-beta.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 + 11.0.0-beta.25511.101 + 11.0.0-beta.25511.101 + 11.0.0-beta.25511.101 + 11.0.0-beta.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 10.0.0-rc.1.25507.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cef0e442bd0..e776f59148e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 429bc7133c19cfc7bca6dc56320bb1fe764d7a62 - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de diff --git a/eng/Versions.props b/eng/Versions.props index f812c5598ba..797b191d642 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 10.0.0-preview-20250930.1 + 10.0.0-preview-20251006.1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 9445c314325..fc8d618014e 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -7,7 +7,7 @@ # See example call for this script below. # # - task: PowerShell@2 -# displayName: Setup Private Feeds Credentials +# displayName: Setup internal Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 @@ -34,19 +34,28 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 +# Adds or enables the package source with the given name +function AddOrEnablePackageSource($sources, $disabledPackageSources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { + if ($disabledPackageSources -eq $null -or -not (EnableInternalPackageSource -DisabledPackageSources $disabledPackageSources -Creds $creds -PackageSourceName $SourceName)) { + AddPackageSource -Sources $sources -SourceName $SourceName -SourceEndPoint $SourceEndPoint -Creds $creds -Username $userName -pwd $Password + } +} + # Add source entry to PackageSources function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) { + Write-Host "Adding package source $SourceName" + $packageSource = $doc.CreateElement("add") $packageSource.SetAttribute("key", $SourceName) $packageSource.SetAttribute("value", $SourceEndPoint) $sources.AppendChild($packageSource) | Out-Null } else { - Write-Host "Package source $SourceName already present." + Write-Host "Package source $SourceName already present and enabled." } AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd @@ -59,6 +68,8 @@ function AddCredential($creds, $source, $username, $pwd) { return; } + Write-Host "Inserting credential for feed: " $source + # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -91,24 +102,27 @@ function AddCredential($creds, $source, $username, $pwd) { $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { - $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") - - Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." - - ForEach ($PackageSource in $maestroPrivateSources) { - Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd +# Enable all darc-int package sources. +function EnableMaestroInternalPackageSources($DisabledPackageSources, $Creds) { + $maestroInternalSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") + ForEach ($DisabledPackageSource in $maestroInternalSources) { + EnableInternalPackageSource -DisabledPackageSources $DisabledPackageSources -Creds $Creds -PackageSourceName $DisabledPackageSource.key } } -function EnablePrivatePackageSources($DisabledPackageSources) { - $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") - ForEach ($DisabledPackageSource in $maestroPrivateSources) { - Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" +# Enables an internal package source by name, if found. Returns true if the package source was found and enabled, false otherwise. +function EnableInternalPackageSource($DisabledPackageSources, $Creds, $PackageSourceName) { + $DisabledPackageSource = $DisabledPackageSources.SelectSingleNode("add[@key='$PackageSourceName']") + if ($DisabledPackageSource) { + Write-Host "Enabling internal source '$($DisabledPackageSource.key)'." + # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries $DisabledPackageSources.RemoveChild($DisabledPackageSource) + + AddCredential -Creds $creds -Source $DisabledPackageSource.Key -Username $userName -pwd $Password + return $true } + return $false } if (!(Test-Path $ConfigFile -PathType Leaf)) { @@ -121,15 +135,17 @@ $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName $doc.Load($filename) -# Get reference to or create one if none exist already +# Get reference to - fail if none exist $sources = $doc.DocumentElement.SelectSingleNode("packageSources") if ($sources -eq $null) { - $sources = $doc.CreateElement("packageSources") - $doc.DocumentElement.AppendChild($sources) | Out-Null + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile" + ExitWithExitCode 1 } $creds = $null +$feedSuffix = "v3/index.json" if ($Password) { + $feedSuffix = "v2" # Looks for a node. Create it if none is found. $creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") if ($creds -eq $null) { @@ -138,33 +154,22 @@ if ($Password) { } } +$userName = "dn-bot" + # Check for disabledPackageSources; we'll enable any darc-int ones we find there $disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources") if ($disabledSources -ne $null) { Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node" - EnablePrivatePackageSources -DisabledPackageSources $disabledSources -} - -$userName = "dn-bot" - -# Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password - -# 3.1 uses a different feed url format so it's handled differently here -$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") -if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password + EnableMaestroInternalPackageSources -DisabledPackageSources $disabledSources -Creds $creds } - $dotnetVersions = @('5','6','7','8','9','10') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password } } diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index ddf4efc81a4..dd2564aef01 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -52,78 +52,126 @@ if [[ `uname -s` == "Darwin" ]]; then TB='' fi -# Ensure there is a ... section. -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding ... section." - ConfigNodeHeader="" - PackageSourcesTemplate="${TB}${NL}${TB}" +# Enables an internal package source by name, if found. Returns 0 if found and enabled, 1 if not found. +EnableInternalPackageSource() { + local PackageSourceName="$1" + + # Check if disabledPackageSources section exists + grep -i "" "$ConfigFile" > /dev/null + if [ "$?" != "0" ]; then + return 1 # No disabled sources section + fi + + # Check if this source name is disabled + grep -i " /dev/null + if [ "$?" == "0" ]; then + echo "Enabling internal source '$PackageSourceName'." + # Remove the disabled entry + local OldDisableValue="" + local NewDisableValue="" + sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile" + + # Add the source name to PackageSources for credential handling + PackageSources+=("$PackageSourceName") + return 0 # Found and enabled + fi + + return 1 # Not found in disabled sources +} + +# Add source entry to PackageSources +AddPackageSource() { + local SourceName="$1" + local SourceEndPoint="$2" + + # Check if source already exists + grep -i " /dev/null + if [ "$?" == "0" ]; then + echo "Package source $SourceName already present and enabled." + PackageSources+=("$SourceName") + return + fi + + echo "Adding package source $SourceName" + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" "$ConfigFile" + PackageSources+=("$SourceName") +} + +# Adds or enables the package source with the given name +AddOrEnablePackageSource() { + local SourceName="$1" + local SourceEndPoint="$2" + + # Try to enable if disabled, if not found then add new source + EnableInternalPackageSource "$SourceName" + if [ "$?" != "0" ]; then + AddPackageSource "$SourceName" "$SourceEndPoint" + fi +} - sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile -fi +# Enable all darc-int package sources +EnableMaestroInternalPackageSources() { + # Check if disabledPackageSources section exists + grep -i "" "$ConfigFile" > /dev/null + if [ "$?" != "0" ]; then + return # No disabled sources section + fi + + # Find all darc-int disabled sources + local DisabledDarcIntSources=() + DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' "$ConfigFile" | tr -d '"') + + for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do + if [[ $DisabledSourceName == darc-int* ]]; then + EnableInternalPackageSource "$DisabledSourceName" + fi + done +} -# Ensure there is a ... section. -grep -i "" $ConfigFile +# Ensure there is a ... section. +grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding ... section." - - PackageSourcesNodeFooter="" - PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile" + ExitWithExitCode 1 fi PackageSources=() -# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present -grep -i "... section. + grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + echo "Adding ... section." - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet3.1-internal') - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal-transport to the packageSources." PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile fi - PackageSources+=('dotnet3.1-internal-transport') +fi + +# Check for disabledPackageSources; we'll enable any darc-int ones we find there +grep -i "" $ConfigFile > /dev/null +if [ "$?" == "0" ]; then + echo "Checking for any darc-int disabled package sources in the disabledPackageSources node" + EnableMaestroInternalPackageSources fi DotNetVersions=('5' '6' '7' '8' '9' '10') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; - grep -i " /dev/null if [ "$?" == "0" ]; then - grep -i "" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=("$FeedPrefix-internal") - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding $FeedPrefix-internal-transport to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=("$FeedPrefix-internal-transport") + AddOrEnablePackageSource "$FeedPrefix-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal/nuget/$FeedSuffix" + AddOrEnablePackageSource "$FeedPrefix-internal-transport" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal-transport/nuget/$FeedSuffix" fi done @@ -139,29 +187,12 @@ if [ "$CredToken" ]; then # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding credentials for $FeedName." + echo " Inserting credential for feed: $FeedName" PackageSourceCredentialsNodeFooter="" - NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + NewCredential="${TB}${TB}<$FeedName>${NL}${TB}${NL}${TB}${TB}${NL}${TB}${TB}" sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi done fi - -# Re-enable any entries in disabledPackageSources where the feed name contains darc-int -grep -i "" $ConfigFile -if [ "$?" == "0" ]; then - DisabledDarcIntSources=() - echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile" - DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile | tr -d '"') - for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do - if [[ $DisabledSourceName == darc-int* ]] - then - OldDisableValue="" - NewDisableValue="" - sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile - echo "Neutralized disablePackageSources entry for '$DisabledSourceName'" - fi - done -fi diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 5ce51840619..cb4ccc023a3 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,8 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + enablePreviewMicrobuild: false + microbuildPluginVersion: 'latest' enableMicrobuildForMacAndLinux: false microbuildUseESRP: true enablePublishBuildArtifacts: false @@ -128,6 +130,8 @@ jobs: - template: /eng/common/core-templates/steps/install-microbuild.yml parameters: enableMicrobuild: ${{ parameters.enableMicrobuild }} + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }} enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} microbuildUseESRP: ${{ parameters.microbuildUseESRP }} continueOnError: ${{ parameters.continueOnError }} @@ -153,6 +157,8 @@ jobs: - template: /eng/common/core-templates/steps/cleanup-microbuild.yml parameters: enableMicrobuild: ${{ parameters.enableMicrobuild }} + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }} enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml new file mode 100644 index 00000000000..9fdf3a11677 --- /dev/null +++ b/eng/common/core-templates/steps/install-microbuild-impl.yml @@ -0,0 +1,34 @@ +parameters: + - name: microbuildTaskInputs + type: object + default: {} + + - name: microbuildEnv + type: object + default: {} + + - name: enablePreviewMicrobuild + type: boolean + default: false + + - name: condition + type: string + + - name: continueOnError + type: boolean + +steps: +- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}: + - task: MicroBuildSigningPluginPreview@4 + displayName: Install Preview MicroBuild plugin (Windows) + inputs: ${{ parameters.microbuildTaskInputs }} + env: ${{ parameters.microbuildEnv }} + continueOnError: ${{ parameters.continueOnError }} + condition: ${{ parameters.condition }} +- ${{ else }}: + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin (Windows) + inputs: ${{ parameters.microbuildTaskInputs }} + env: ${{ parameters.microbuildEnv }} + continueOnError: ${{ parameters.continueOnError }} + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index d6b9878f54d..bdebec0eaa9 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -4,6 +4,8 @@ parameters: # Enable install tasks for MicroBuild on Mac and Linux # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' enableMicrobuildForMacAndLinux: false + # Enable preview version of MB signing plugin + enablePreviewMicrobuild: false # Determines whether the ESRP service connection information should be passed to the signing plugin. # This overlaps with _SignType to some degree. We only need the service connection for real signing. # It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place. @@ -14,6 +16,8 @@ parameters: # Location of the MicroBuild output folder # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly. microBuildOutputFolder: '$(Build.SourcesDirectory)' + # Microbuild version + microbuildPluginVersion: 'latest' continueOnError: false @@ -51,41 +55,45 @@ steps: # YAML expansion, and Windows vs. Linux/Mac uses different service connections. However, # we can avoid including the MB install step if not enabled at all. This avoids a bunch of # extra pipeline authorizations, since most pipelines do not sign on non-Windows. - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (Windows) - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(parameters.microbuildUseESRP, true) }}: - ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca - env: - TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) - - - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (non-Windows) - inputs: + - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self + parameters: + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildTaskInputs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + version: ${{ parameters.microbuildPluginVersion }} ${{ if eq(parameters.microbuildUseESRP, true) }}: ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea ${{ else }}: - ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc - env: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + microbuildEnv: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) + + - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: + - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self + parameters: + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildTaskInputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + version: ${{ parameters.microbuildPluginVersion }} + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ${{ else }}: + ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc + microbuildEnv: + TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 477a44f335b..f7bd4af0c8d 100755 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -30,6 +30,8 @@ case "$os" in elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio + elif [ "$ID" = "amzn" ]; then + dnf install -y cmake llvm lld lldb clang python libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio elif [ "$ID" = "alpine" ]; then apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio else diff --git a/global.json b/global.json index 22a98c65976..9714d896ce5 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25507.102", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25507.102", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25511.101", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25511.101", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 23e53275f02eaef010620bd39dcb5bfd5288381d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 10:51:18 +0530 Subject: [PATCH 22/46] Update dependencies from https://github.com/dotnet/dotnet build 286825 (#11173) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25511.101 -> 11.0.0-beta.25513.104) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25511.101 -> 10.0.0-rc.1.25513.104) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4c556233691..cfeb54e23b8 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25511.101 - 11.0.0-beta.25511.101 - 11.0.0-beta.25511.101 - 11.0.0-beta.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 + 11.0.0-beta.25513.104 + 11.0.0-beta.25513.104 + 11.0.0-beta.25513.104 + 11.0.0-beta.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 - 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25513.104 10.0.0-rc.1.25507.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e776f59148e..4f3a73e58af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 429bc7133c19cfc7bca6dc56320bb1fe764d7a62 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de + 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 diff --git a/global.json b/global.json index 9714d896ce5..7212a59bac2 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25511.101", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25511.101", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25513.104", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25513.104", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 2b72bd46a069d6529dbebb53962794977c9c2a67 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 05:39:12 +0000 Subject: [PATCH 23/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251013.6 (#11177) [main] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index cfeb54e23b8..8334c195669 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25513.104 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25507.2 + 10.0.0-rc.1.25513.6 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f3a73e58af..f6b9e847490 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 429bc7133c19cfc7bca6dc56320bb1fe764d7a62 + 41ac6d1d263c4ea762c8c0926e51c26894232885 https://github.com/dotnet/dotnet From 2407a9af6e1b94557ab21e8eefd890338f620157 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 16:02:20 +0530 Subject: [PATCH 24/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251013.8 (#11178) On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.1.25513.6 -> To Version 10.0.0-rc.1.25513.8 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 8334c195669..042b4c44140 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25513.104 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.6 + 10.0.0-rc.1.25513.8 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6b9e847490..79bb1fac3d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 41ac6d1d263c4ea762c8c0926e51c26894232885 + 6ae9d774864ecf3dde943c58647257f250505fd9 https://github.com/dotnet/dotnet From 678ffdf5b7b93925a12af95020c51604f46dd091 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Oct 2025 11:03:17 +0530 Subject: [PATCH 25/46] [main] Source code updates from dotnet/dotnet (#11190) * Update dependencies from https://github.com/dotnet/dotnet build 287091 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25513.104 -> 11.0.0-beta.25514.106) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25513.104 -> 10.0.0-rc.1.25514.106) * Update dependencies from https://github.com/dotnet/dotnet build 287240 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25514.106 -> 11.0.0-beta.25515.101) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25514.106 -> 10.0.0-rc.1.25515.101) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 042b4c44140..9ea1e5da94f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25513.104 - 11.0.0-beta.25513.104 - 11.0.0-beta.25513.104 - 11.0.0-beta.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 + 11.0.0-beta.25515.101 + 11.0.0-beta.25515.101 + 11.0.0-beta.25515.101 + 11.0.0-beta.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 - 10.0.0-rc.1.25513.104 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25515.101 10.0.0-rc.1.25513.8 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79bb1fac3d2..8f1cbd60bbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6ae9d774864ecf3dde943c58647257f250505fd9 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 01abb3ec5c4cbffec5b33e02156bd3d2a8913b04 + 6422c4b30a1b96ec5ba148759fab13dde95f5e89 diff --git a/global.json b/global.json index 7212a59bac2..8e3e95c72d3 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25513.104", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25513.104", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25515.101", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25515.101", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From b9ac89567bd14c002f1fcde46652f8c08d80b404 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Oct 2025 10:55:06 +0530 Subject: [PATCH 26/46] [main] Source code updates from dotnet/dotnet (#11198) * Update dependencies from https://github.com/dotnet/dotnet build 287454 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25515.101 -> 11.0.0-beta.25515.110) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25515.101 -> 10.0.0-rc.1.25515.110) * Update dependencies from https://github.com/dotnet/dotnet build 287677 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25515.110 -> 11.0.0-beta.25517.107) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25515.110 -> 10.0.0-rc.1.25517.107) * Update dependencies from https://github.com/dotnet/dotnet build 287856 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25517.107 -> 11.0.0-beta.25520.104) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25517.107 -> 10.0.0-rc.1.25520.104) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 9ea1e5da94f..cf1db25846d 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25515.101 - 11.0.0-beta.25515.101 - 11.0.0-beta.25515.101 - 11.0.0-beta.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 + 11.0.0-beta.25520.104 + 11.0.0-beta.25520.104 + 11.0.0-beta.25520.104 + 11.0.0-beta.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 - 10.0.0-rc.1.25515.101 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25520.104 10.0.0-rc.1.25513.8 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f1cbd60bbe..8208512313d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6ae9d774864ecf3dde943c58647257f250505fd9 - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 6422c4b30a1b96ec5ba148759fab13dde95f5e89 + 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f diff --git a/global.json b/global.json index 8e3e95c72d3..01716295c8a 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25515.101", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25515.101", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25520.104", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25520.104", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 6de80cf763f3aac099a70948cafba6c030fb33b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Oct 2025 11:04:53 +0530 Subject: [PATCH 27/46] [main] Source code updates from dotnet/dotnet (#11203) * Update dependencies from https://github.com/dotnet/dotnet build 288041 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25520.104 -> 11.0.0-beta.25521.106) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25520.104 -> 10.0.0-rc.1.25521.106) * Update dependencies from https://github.com/dotnet/dotnet build 288109 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25521.106 -> 11.0.0-beta.25522.101) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25521.106 -> 10.0.0-rc.1.25522.101) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +- eng/Version.Details.xml | 90 ++-- eng/common/SetupNugetSources.sh | 6 +- .../job/publish-build-assets.yml | 24 +- .../core-templates/post-build/post-build.yml | 450 +++++++++--------- .../steps/install-microbuild.yml | 15 +- eng/common/post-build/publish-using-darc.ps1 | 4 +- eng/common/sdk-task.ps1 | 2 + global.json | 4 +- 9 files changed, 330 insertions(+), 309 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index cf1db25846d..10a6015989c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25520.104 - 11.0.0-beta.25520.104 - 11.0.0-beta.25520.104 - 11.0.0-beta.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 + 11.0.0-beta.25522.101 + 11.0.0-beta.25522.101 + 11.0.0-beta.25522.101 + 11.0.0-beta.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 - 10.0.0-rc.1.25520.104 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25522.101 10.0.0-rc.1.25513.8 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8208512313d..bf6217cfbea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6ae9d774864ecf3dde943c58647257f250505fd9 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 1bdc5cdcf4cf408e00aa3c60f58520083bf2474f + 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index dd2564aef01..b97cc536379 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -66,10 +66,8 @@ EnableInternalPackageSource() { grep -i " /dev/null if [ "$?" == "0" ]; then echo "Enabling internal source '$PackageSourceName'." - # Remove the disabled entry - local OldDisableValue="" - local NewDisableValue="" - sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile" + # Remove the disabled entry (including any surrounding comments or whitespace on the same line) + sed -i.bak "//d" "$ConfigFile" # Add the source name to PackageSources for credential handling PackageSources+=("$PackageSourceName") diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 37dff559fc1..721a5566699 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -91,8 +91,8 @@ jobs: fetchDepth: 3 clean: true - - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: - - ${{ if eq(parameters.publishingVersion, 3) }}: + - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: + - ${{ if eq(parameters.publishingVersion, 3) }}: - task: DownloadPipelineArtifact@2 displayName: Download Asset Manifests inputs: @@ -117,9 +117,16 @@ jobs: flattenFolders: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: NuGetAuthenticate@1 + # Populate internal runtime variables. + - template: /eng/common/templates/steps/enable-internal-sources.yml + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + - task: AzureCLI@2 displayName: Publish Build Assets inputs: @@ -132,9 +139,12 @@ jobs: /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} /p:MaestroApiEndpoint=https://maestro.dot.net /p:OfficialBuildId=$(OfficialBuildId) + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -162,7 +172,7 @@ jobs: artifactName: AssetManifests displayName: 'Publish Merged Manifest' retryCountOnTaskFailure: 10 # for any logs being locked - sbomEnabled: false # we don't need SBOM for logs + sbomEnabled: false # we don't need SBOM for logs - template: /eng/common/core-templates/steps/publish-build-artifacts.yml parameters: @@ -195,9 +205,11 @@ jobs: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/core-templates/steps/publish-logs.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index f6f87fe5c67..0cea81c74f2 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -1,106 +1,106 @@ parameters: - # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. - # Publishing V1 is no longer supported - # Publishing V2 is no longer supported - # Publishing V3 is the default - - name: publishingInfraVersion - displayName: Which version of publishing should be used to promote the build definition? - type: number - default: 3 - values: - - 3 - - - name: BARBuildId - displayName: BAR Build Id - type: number - default: 0 - - - name: PromoteToChannelIds - displayName: Channel to promote BARBuildId to - type: string - default: '' - - - name: enableSourceLinkValidation - displayName: Enable SourceLink validation - type: boolean - default: false - - - name: enableSigningValidation - displayName: Enable signing validation - type: boolean - default: true - - - name: enableSymbolValidation - displayName: Enable symbol validation - type: boolean - default: false - - - name: enableNugetValidation - displayName: Enable NuGet validation - type: boolean - default: true - - - name: publishInstallersAndChecksums - displayName: Publish installers and checksums - type: boolean - default: true - - - name: requireDefaultChannels - displayName: Fail the build if there are no default channel(s) registrations for the current build - type: boolean - default: false - - - name: SDLValidationParameters - type: object - default: - enable: false - publishGdn: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: true - - - name: isAssetlessBuild - type: boolean - displayName: Is Assetless Build - default: false - - # These parameters let the user customize the call to sdk-task.ps1 for publishing - # symbols & general artifacts as well as for signing validation - - name: symbolPublishingAdditionalParameters - displayName: Symbol publishing additional parameters - type: string - default: '' - - - name: artifactsPublishingAdditionalParameters - displayName: Artifact publishing additional parameters - type: string - default: '' - - - name: signingValidationAdditionalParameters - displayName: Signing validation additional parameters - type: string - default: '' - - # Which stages should finish execution before post-build stages start - - name: validateDependsOn - type: object - default: - - build - - - name: publishDependsOn - type: object - default: - - Validate - - # Optional: Call asset publishing rather than running in a separate stage - - name: publishAssetsImmediately - type: boolean - default: false - - - name: is1ESPipeline - type: boolean - default: false +# Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. +# Publishing V1 is no longer supported +# Publishing V2 is no longer supported +# Publishing V3 is the default +- name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + +- name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + +- name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + +- name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + +- name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + +- name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + +- name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + +- name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + +- name: requireDefaultChannels + displayName: Fail the build if there are no default channel(s) registrations for the current build + type: boolean + default: false + +- name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + +- name: isAssetlessBuild + type: boolean + displayName: Is Assetless Build + default: false + +# These parameters let the user customize the call to sdk-task.ps1 for publishing +# symbols & general artifacts as well as for signing validation +- name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + +- name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + +- name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + +# Which stages should finish execution before post-build stages start +- name: validateDependsOn + type: object + default: + - build + +- name: publishDependsOn + type: object + default: + - Validate + +# Optional: Call asset publishing rather than running in a separate stage +- name: publishAssetsImmediately + type: boolean + default: false + +- name: is1ESPipeline + type: boolean + default: false stages: - ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: @@ -108,10 +108,10 @@ stages: dependsOn: ${{ parameters.validateDependsOn }} displayName: Validate Build Assets variables: - - template: /eng/common/core-templates/post-build/common-variables.yml - - template: /eng/common/core-templates/variables/pool-providers.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} jobs: - job: displayName: NuGet Validation @@ -134,28 +134,28 @@ stages: demands: ImageOverride -equals windows.vs2022.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: displayName: Signing Validation @@ -169,54 +169,54 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: /eng/common/core-templates/steps/publish-logs.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - StageLabel: 'Validation' - JobLabel: 'Signing' - BinlogToolVersion: $(BinlogToolVersion) + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@1 + displayName: 'Authenticate to AzDO Feeds' + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + StageLabel: 'Validation' + JobLabel: 'Signing' + BinlogToolVersion: $(BinlogToolVersion) - job: displayName: SourceLink Validation @@ -230,41 +230,41 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true - ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - stage: publish_using_darc @@ -274,10 +274,10 @@ stages: dependsOn: ${{ parameters.validateDependsOn }} displayName: Publish using Darc variables: - - template: /eng/common/core-templates/post-build/common-variables.yml - - template: /eng/common/core-templates/variables/pool-providers.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} jobs: - job: displayName: Publish Using Darc @@ -291,30 +291,36 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: > + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: NuGetAuthenticate@1 # Populate internal runtime variables. + + - template: /eng/common/templates/steps/enable-internal-sources.yml + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + + - task: AzureCLI@2 + displayName: Publish Using Darc + inputs: + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' @@ -323,3 +329,5 @@ stages: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index bdebec0eaa9..3d42d9a5661 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -13,9 +13,6 @@ parameters: # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. microbuildUseESRP: true - # Location of the MicroBuild output folder - # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly. - microBuildOutputFolder: '$(Build.SourcesDirectory)' # Microbuild version microbuildPluginVersion: 'latest' @@ -24,14 +21,16 @@ parameters: steps: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable + # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms - task: UseDotNet@2 displayName: Install .NET 8.0 SDK for MicroBuild Plugin inputs: packageType: sdk version: 8.0.x - installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet - workingDirectory: ${{ parameters.microBuildOutputFolder }} + # Installing the SDK in a '.dotnet-microbuild' directory is required for signing. + # See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj + # Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic. + installationPath: $(Agent.TempDirectory)/.dotnet-microbuild condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -71,7 +70,7 @@ steps: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) @@ -93,7 +92,7 @@ steps: ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1eda208a3bb..48e55598bdd 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -7,7 +7,9 @@ param( [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $RequireDefaultChannels, - [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing + [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey ) try { diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 4655af7a2d8..9ae443f1c36 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -9,6 +9,8 @@ Param( [switch][Alias('nobl')]$excludeCIBinaryLog, [switch]$noWarnAsError, [switch] $help, + [string] $runtimeSourceFeed = '', + [string] $runtimeSourceFeedKey = '', [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) diff --git a/global.json b/global.json index 01716295c8a..1db56176756 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25520.104", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25520.104", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25522.101", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25522.101", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 2a554cdb61a7db24323217743cad6f0ff5d3512d Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Sun, 26 Oct 2025 06:18:39 +0100 Subject: [PATCH 28/46] Switch test runner to global.json (#11096) * Switch test runner to global.json * Update global.json --- dotnet.config | 2 -- global.json | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 dotnet.config diff --git a/dotnet.config b/dotnet.config deleted file mode 100644 index da0410e32d5..00000000000 --- a/dotnet.config +++ /dev/null @@ -1,2 +0,0 @@ -[dotnet.test.runner] -name = "Microsoft.Testing.Platform" diff --git a/global.json b/global.json index 1db56176756..d52dd7748a0 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25420.111", + "version": "10.0.100-rc.2.25502.107", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "10.0.100-rc.1.25420.111", + "dotnet": "10.0.100-rc.2.25502.107", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCorePlatformsVersion)" @@ -23,6 +23,9 @@ "version": "17.2" } }, + "test": { + "runner": "Microsoft.Testing.Platform" + }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25522.101", "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25522.101", From b2b4a6385e5c0e81416e16aa0da8006d167eac3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 10:40:22 +0530 Subject: [PATCH 29/46] [main] Update dependencies from dnceng/internal/dotnet-wpf-int (#11208) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251020.2 On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.1.25513.8 -> To Version 10.0.0-rc.1.25520.2 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251024.1 On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.1.25513.8 -> To Version 10.0.0-rc.1.25524.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 10a6015989c..20ddfef569b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25522.101 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25513.8 + 10.0.0-rc.1.25524.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf6217cfbea..a7bc67e8ced 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 6ae9d774864ecf3dde943c58647257f250505fd9 + 52c50f4cf47a024c8882baa63640acecc2fb6e79 https://github.com/dotnet/dotnet From d95a269999290bfb6202bd798c0c2fceaf0f4373 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 05:10:47 +0000 Subject: [PATCH 30/46] [main] Source code updates from dotnet/dotnet (#11207) [main] Source code updates from dotnet/dotnet --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 20ddfef569b..f952163e3c2 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25522.101 - 11.0.0-beta.25522.101 - 11.0.0-beta.25522.101 - 11.0.0-beta.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 + 11.0.0-beta.25524.106 + 11.0.0-beta.25524.106 + 11.0.0-beta.25524.106 + 11.0.0-beta.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 - 10.0.0-rc.1.25522.101 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25524.106 10.0.0-rc.1.25524.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7bc67e8ced..2dd0b0b412e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 52c50f4cf47a024c8882baa63640acecc2fb6e79 - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 2e13727a96e95d0856ff9fa35bb896b1c1b633e6 + f5afaa5ed1d15c5750ebc71a06e39611272e7eca diff --git a/global.json b/global.json index d52dd7748a0..eca603cbbb8 100644 --- a/global.json +++ b/global.json @@ -27,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25522.101", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25522.101", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25524.106", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25524.106", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From bb7380219584386913543f00f13090cb45db1116 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 11:15:46 +0530 Subject: [PATCH 31/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251026.1 (#11210) On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.1.25524.1 -> To Version 10.0.0-rc.1.25526.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f952163e3c2..501381cd39e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25524.106 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.1 + 10.0.0-rc.1.25526.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dd0b0b412e..f59e61ce702 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet f5afaa5ed1d15c5750ebc71a06e39611272e7eca - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 52c50f4cf47a024c8882baa63640acecc2fb6e79 + 2352795e1a74fc4e539d325359d38ddd33651450 https://github.com/dotnet/dotnet From 092d18b5b2a6f0f1d9963730a4423c95c84652cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 11:16:15 +0530 Subject: [PATCH 32/46] Update dependencies from https://github.com/dotnet/dotnet build 288768 (#11212) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25524.106 -> 11.0.0-beta.25527.104) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25524.106 -> 10.0.0-rc.1.25527.104) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 501381cd39e..86516a5fb65 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25524.106 - 11.0.0-beta.25524.106 - 11.0.0-beta.25524.106 - 11.0.0-beta.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 + 11.0.0-beta.25527.104 + 11.0.0-beta.25527.104 + 11.0.0-beta.25527.104 + 11.0.0-beta.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 - 10.0.0-rc.1.25524.106 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25527.104 10.0.0-rc.1.25526.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f59e61ce702..45ffacf1782 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 2352795e1a74fc4e539d325359d38ddd33651450 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - f5afaa5ed1d15c5750ebc71a06e39611272e7eca + 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 diff --git a/global.json b/global.json index eca603cbbb8..547325364cd 100644 --- a/global.json +++ b/global.json @@ -27,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25524.106", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25524.106", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25527.104", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25527.104", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From acd1f5d0168837d9125e33fe1ae570911b697e5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Oct 2025 11:12:55 +0530 Subject: [PATCH 33/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251027.2 (#11213) On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.1.25526.1 -> To Version 10.0.0-rc.1.25527.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 86516a5fb65..bc2745530e0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25527.104 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25526.1 + 10.0.0-rc.1.25527.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45ffacf1782..8082ec4b83d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 2352795e1a74fc4e539d325359d38ddd33651450 + 91db64e45a942ac7661993f6e4f09bd8d1f37c0d https://github.com/dotnet/dotnet From 808031c2d49fd49ece87fb1e27d9c0774f30aa6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Oct 2025 11:13:41 +0530 Subject: [PATCH 34/46] [main] Source code updates from dotnet/dotnet (#11216) * Update dependencies from https://github.com/dotnet/dotnet build 288891 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25527.104 -> 11.0.0-beta.25528.102) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25527.104 -> 10.0.0-rc.1.25528.102) * Update dependencies from https://github.com/dotnet/dotnet build 288940 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25528.102 -> 11.0.0-beta.25529.101) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25528.102 -> 10.0.0-rc.1.25529.101) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index bc2745530e0..68458c44650 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25527.104 - 11.0.0-beta.25527.104 - 11.0.0-beta.25527.104 - 11.0.0-beta.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 + 11.0.0-beta.25529.101 + 11.0.0-beta.25529.101 + 11.0.0-beta.25529.101 + 11.0.0-beta.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 - 10.0.0-rc.1.25527.104 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25529.101 10.0.0-rc.1.25527.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8082ec4b83d..291c798d075 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 91db64e45a942ac7661993f6e4f09bd8d1f37c0d - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 3f54eaec69c39ed3d3dbbc5aa65f77537729f3a7 + cdc420f453860b662a76fcc72672ed2a65243146 diff --git a/global.json b/global.json index 547325364cd..cdf41c6d197 100644 --- a/global.json +++ b/global.json @@ -27,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25527.104", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25527.104", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25529.101", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25529.101", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 86542ff312fadf0e2f89abedb50847b36af22cdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Nov 2025 05:19:35 +0000 Subject: [PATCH 35/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251029.1 (#11218) [main] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 68458c44650..3e32234c27f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25529.101 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25527.2 + 10.0.0-rc.1.25529.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 291c798d075..bd2722b7bbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet cdc420f453860b662a76fcc72672ed2a65243146 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 91db64e45a942ac7661993f6e4f09bd8d1f37c0d + 5f36280b0a1ca1026e7f3aca9bd1ed1da99059f6 https://github.com/dotnet/dotnet From 81291f92acfa551baab87670f0e9b1c06a5e8018 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Nov 2025 05:23:03 +0000 Subject: [PATCH 36/46] [main] Source code updates from dotnet/dotnet (#11220) [main] Source code updates from dotnet/dotnet --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 3e32234c27f..f3d793c18d5 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25529.101 - 11.0.0-beta.25529.101 - 11.0.0-beta.25529.101 - 11.0.0-beta.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 + 11.0.0-beta.25531.101 + 11.0.0-beta.25531.101 + 11.0.0-beta.25531.101 + 11.0.0-beta.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 - 10.0.0-rc.1.25529.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25531.101 10.0.0-rc.1.25529.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd2722b7bbb..f7f34cfc03f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 5f36280b0a1ca1026e7f3aca9bd1ed1da99059f6 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - cdc420f453860b662a76fcc72672ed2a65243146 + 6ad4d0db4a7569ab9944901096381c5eff133709 diff --git a/global.json b/global.json index cdf41c6d197..c3af8ee3fe9 100644 --- a/global.json +++ b/global.json @@ -27,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25529.101", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25529.101", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25531.101", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25531.101", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From fb19499f73641b9228a61375ff2abe58c0bc55ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Nov 2025 06:41:48 +0000 Subject: [PATCH 37/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251102.1 (#11221) [main] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f3d793c18d5..0e1e8a64e1e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25531.101 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25529.1 + 10.0.0-rc.1.25552.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7f34cfc03f..f3f132fc689 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 6ad4d0db4a7569ab9944901096381c5eff133709 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 5f36280b0a1ca1026e7f3aca9bd1ed1da99059f6 + fbf3653d46ee940938937f6d8ad095e7aacbd921 https://github.com/dotnet/dotnet From 16bc22e4c52e62ad09abd50eb64709f6684b3ffd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Nov 2025 02:10:43 +0000 Subject: [PATCH 38/46] Update dependencies from https://github.com/dotnet/dotnet build 289373 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25531.101 -> 11.0.0-beta.25553.108) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25531.101 -> 10.0.0-rc.1.25553.108) --- eng/Version.Details.props | 44 ++++----- eng/Version.Details.xml | 90 +++++++++---------- .../core-templates/steps/publish-logs.yml | 2 + eng/common/post-build/redact-logs.ps1 | 4 +- global.json | 4 +- 5 files changed, 74 insertions(+), 70 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0e1e8a64e1e..625ca79ec29 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25531.101 - 11.0.0-beta.25531.101 - 11.0.0-beta.25531.101 - 11.0.0-beta.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 + 11.0.0-beta.25553.108 + 11.0.0-beta.25553.108 + 11.0.0-beta.25553.108 + 11.0.0-beta.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 10.0.0-rc.1.25552.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3f132fc689..061a2fe1b8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int fbf3653d46ee940938937f6d8ad095e7aacbd921 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 10f825e270a..0664c343b2a 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -28,6 +28,8 @@ steps: arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 index b7fc1959150..fc0218a013d 100644 --- a/eng/common/post-build/redact-logs.ps1 +++ b/eng/common/post-build/redact-logs.ps1 @@ -7,7 +7,9 @@ param( # File with strings to redact - separated by newlines. # For comments start the line with '# ' - such lines are ignored [Parameter(Mandatory=$false)][string] $TokensFilePath, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact + [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey ) try { diff --git a/global.json b/global.json index c3af8ee3fe9..b430b23121c 100644 --- a/global.json +++ b/global.json @@ -27,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25531.101", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25531.101", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25553.108", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25553.108", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 47d78bd2ef4405890d13a64901ba5cdf997d1e71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Nov 2025 05:54:52 +0000 Subject: [PATCH 39/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251103.2 On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.1.25552.1 -> To Version 10.0.0-rc.1.25553.2 --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 625ca79ec29..82f50598f10 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25553.108 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25552.1 + 10.0.0-rc.1.25553.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 061a2fe1b8d..439526b4ec6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - fbf3653d46ee940938937f6d8ad095e7aacbd921 + 9dccd83504dd8935bd3f2e6fb2b7d0043f909c3b https://github.com/dotnet/dotnet From 6c8a16ec12b16b1b7c7a113b6c44487fd486208a Mon Sep 17 00:00:00 2001 From: vinnarayana-msft Date: Tue, 4 Nov 2025 16:43:47 +0530 Subject: [PATCH 40/46] Updated .Net version in developer guide (#11225) --- Documentation/developer-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md index 5cf8b291422..c10e2afb77e 100644 --- a/Documentation/developer-guide.md +++ b/Documentation/developer-guide.md @@ -52,7 +52,7 @@ Go to the csproj file and append this line at the bottom of it. ` WinExe - net6.0-windows + net10.0-windows true From 42f7d5d89b211409b9c11a294bfcd78cbe748664 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Nov 2025 10:41:04 +0530 Subject: [PATCH 41/46] [main] Source code updates from dotnet/dotnet (#11232) * Update dependencies from https://github.com/dotnet/dotnet build 289425 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25553.108 -> 11.0.0-beta.25553.112) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25553.108 -> 10.0.0-rc.1.25553.112) * Update dependencies from https://github.com/dotnet/dotnet build 289655 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25553.112 -> 11.0.0-beta.25555.103) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25553.112 -> 10.0.0-rc.1.25555.103) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 625ca79ec29..05e2cc6c16f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25553.108 - 11.0.0-beta.25553.108 - 11.0.0-beta.25553.108 - 11.0.0-beta.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 + 11.0.0-beta.25555.103 + 11.0.0-beta.25555.103 + 11.0.0-beta.25555.103 + 11.0.0-beta.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 10.0.0-rc.1.25552.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 061a2fe1b8d..69a730f4c5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int fbf3653d46ee940938937f6d8ad095e7aacbd921 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 54c879632fdf0197d517d80e4b90861e2bd5d03e diff --git a/global.json b/global.json index b430b23121c..272a919ffee 100644 --- a/global.json +++ b/global.json @@ -27,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25553.108", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25553.108", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25555.103", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25555.103", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 41f4e5206ea50eb64d4d9d3ae4decc4380f3dca7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Nov 2025 05:47:44 +0000 Subject: [PATCH 42/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251105.3 On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.1.25552.1 -> To Version 10.0.0-rc.1.25555.3 --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 82f50598f10..fddcb8fd00d 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25553.108 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.2 + 10.0.0-rc.1.25555.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 439526b4ec6..35c13ce769e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 9dccd83504dd8935bd3f2e6fb2b7d0043f909c3b + 60c349ca27a771618db8ac808bd66ff56f431962 https://github.com/dotnet/dotnet From 7f5fcafa01a72ff71d84fda51e571358ba99fd45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Nov 2025 06:18:34 +0000 Subject: [PATCH 43/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251109.2 On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.1.25552.1 -> To Version 10.0.0-rc.1.25559.2 --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index fddcb8fd00d..b7b8b0b7a93 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25553.108 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25555.3 + 10.0.0-rc.1.25559.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35c13ce769e..786c341b1f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 60c349ca27a771618db8ac808bd66ff56f431962 + 7278812af2d581beaf32e5fad7e5a9aacceaefab https://github.com/dotnet/dotnet From b0bf6486a5999c44bb8bb18692ce3c2f5b4a5324 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Nov 2025 05:40:02 +0000 Subject: [PATCH 44/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251110.2 On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.1.25559.2 -> To Version 10.0.0-rc.1.25560.2 --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ee419f261f1..47f1e937aa3 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25555.103 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25559.2 + 10.0.0-rc.1.25560.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05c8012f459..ea6fbd0a50b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 7278812af2d581beaf32e5fad7e5a9aacceaefab + 71d8f5c9bcfb0069752a958de30c181ab38a2511 https://github.com/dotnet/dotnet From 8abe0480b09a5eca466953fbda29f2ffa1ba59e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 11 Nov 2025 11:44:30 +0100 Subject: [PATCH 45/46] Remove auditSources from NuGet.config (#11184) The api.nuget.org source will clash with the CFSClean network isolation policy --- NuGet.config | 4 ---- 1 file changed, 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed8e4a9cc71..d278a3ab0b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,9 +18,5 @@ - - - - From 11d749fb679d64e254d6743ddc7eab543779eeb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Nov 2025 06:06:38 +0000 Subject: [PATCH 46/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251112.6 On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.1.25560.2 -> To Version 10.0.0-rc.1.25562.6 --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 47f1e937aa3..1f9f27679e2 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25555.103 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25560.2 + 10.0.0-rc.1.25562.6 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea6fbd0a50b..bf3b2982729 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 71d8f5c9bcfb0069752a958de30c181ab38a2511 + 13c7d2221f68ed09c8113dac2714f4aafd4a235f https://github.com/dotnet/dotnet