diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 343323ce6d2ae..df7f447156156 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -308,6 +308,7 @@ extends:
/p:DotnetPublishUsingPipelines=true
/p:IgnoreIbcMergeErrors=true
/p:GenerateSbom=true
+ /p:ForceAzureComSources=true
condition: succeeded()
- template: /eng/common/templates-official/steps/generate-sbom.yml@self
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 39bf2f2c610a1..0f26c4fff3483 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -53,6 +53,12 @@ variables:
${{ else }}:
value: windows.vs2022preview.amd64
+ - name: Vs2022RegularQueueName
+ ${{ if eq(variables['System.TeamProject'], 'public') }}:
+ value: windows.vs2022.amd64.open
+ ${{ else }}:
+ value: windows.vs2022.amd64
+
- name: UbuntuQueueName
${{ if eq(variables['System.TeamProject'], 'public') }}:
value: Build.Ubuntu.2004.Amd64.Open
@@ -107,6 +113,11 @@ parameters:
default:
name: $(PoolName)
demands: ImageOverride -equals $(Vs2022PreviewQueueName)
+ - name: vs2022RegularPool
+ type: object
+ default:
+ name: $(PoolName)
+ demands: ImageOverride -equals $(Vs2022RegularQueueName)
stages:
- stage: Windows_Debug_Build
@@ -271,7 +282,7 @@ stages:
jobName: Test_Windows_CoreClr_Debug_Single_Machine
testArtifactName: Transport_Artifacts_Windows_Debug
configuration: Debug
- poolParameters: ${{ parameters.vs2022PreviewPool }}
+ poolParameters: ${{ parameters.vs2022RegularPool }}
testArguments: -testCoreClr
- template: eng/pipelines/test-windows-job.yml
diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index a65c44c42232f..4fbc6c58e26cf 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -319,7 +319,7 @@
Infra
-->
-
+
diff --git a/eng/InternalTools.props b/eng/InternalTools.props
index ab7600ec62793..110ac628fd153 100644
--- a/eng/InternalTools.props
+++ b/eng/InternalTools.props
@@ -10,6 +10,15 @@
$(RestoreSources);
https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json
+
+
+
+ https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
+ https://pkgs.dev.azure.com/devdiv/_packaging/VS/nuget/v3/index.json;
+ https://pkgs.dev.azure.com/devdiv/_packaging/Engineering/nuget/v3/index.json;
+ https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
+ https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json
+
diff --git a/eng/pipelines/test-windows-job-single-machine.yml b/eng/pipelines/test-windows-job-single-machine.yml
index 75acc4af38da4..975bdb744f2f0 100644
--- a/eng/pipelines/test-windows-job-single-machine.yml
+++ b/eng/pipelines/test-windows-job-single-machine.yml
@@ -33,7 +33,7 @@ jobs:
displayName: 'Install .NET 9 Runtime'
inputs:
packageType: runtime
- version: 9.0.0-preview.3.24172.9
+ version: 9.0.0-rc.2.24473.5
includePreviewVersions: true
installationPath: '$(Build.SourcesDirectory)/.dotnet'
diff --git a/src/CodeStyle/Tools/Program.cs b/src/CodeStyle/Tools/Program.cs
index adbc52aa691ee..5468a0705ee99 100644
--- a/src/CodeStyle/Tools/Program.cs
+++ b/src/CodeStyle/Tools/Program.cs
@@ -245,8 +245,8 @@ and an implied numerical option (such as '4') -->
'$(AnalysisLevelStyle)' != ''">$(AnalysisLevelStyle)
- <_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle>$(AnalysisLevelSuffixStyle)
- <_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle Condition="'$(_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle)' == ''">$(AnalysisModeStyle)
+ <_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle>$(AnalysisModeStyle)
+ <_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle Condition="'$(_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle)' == ''">$(AnalysisLevelSuffixStyle)
<_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle Condition="'$(_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle)' == 'AllEnabledByDefault'">{nameof(AnalysisMode.All)}
<_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle Condition="'$(_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle)' == 'AllDisabledByDefault'">{nameof(AnalysisMode.None)}
<_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle Condition="'$(_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle)' == ''">{nameof(AnalysisMode.Default)}
@@ -258,9 +258,9 @@ and an implied numerical option (such as '4') -->
<_GlobalAnalyzerConfigFile_MicrosoftCodeAnalysis{language}CodeStyle Condition="'$(_GlobalAnalyzerConfigFileName_MicrosoftCodeAnalysis{language}CodeStyle)' != ''">$(_GlobalAnalyzerConfigDir_MicrosoftCodeAnalysis{language}CodeStyle)\$(_GlobalAnalyzerConfigFileName_MicrosoftCodeAnalysis{language}CodeStyle)
-
+
+ ('$(AnalysisLevelStyle)' != '$(AnalysisLevel)' or '$(AnalysisModeStyle)' != '$(AnalysisMode)' or ('$(EffectiveAnalysisLevelStyle)' != '' and $([MSBuild]::VersionGreaterThanOrEquals('$(EffectiveAnalysisLevelStyle)', '10.0'))))">