Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/dev17.13 to main #76006

Merged
merged 9 commits into from
Nov 21, 2024
Merged

Merge release/dev17.13 to main #76006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6aefa05
Postpone the code-style analysis config rule until NET10
arunchndr Nov 19, 2024
07d5ae0
Allow AnalysisModeStyle to override AnalysisLevelSuffixStyle
JoeRobich Nov 19, 2024
589749f
[backport] Postpone respecting the code-style analysis config rule un…
arunchndr Nov 20, 2024
45a36ca
[backport] Update structured logger
JoeRobich Nov 20, 2024
fa36e1a
Workaround failing official builds (#75898) (#75998)
JoeRobich Nov 20, 2024
913fb4e
[backport] Update structured logger (#75994)
JoeRobich Nov 21, 2024
5fa7336
Merge branch 'release/dev17.12' into release/dev17.13
jjonescz Nov 21, 2024
544abab
Merge release/dev17.12 to release/dev17.13 (#75993)
dotnet-bot Nov 21, 2024
6d7ee38
Update .NET 9 runtime for single machine CI job (#75889)
jjonescz Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions azure-pipelines-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 12 additions & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
Infra
-->
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.169" />
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.386" />
<PackageVersion Include="Mono.Options" Version="6.6.0.161" />
<PackageVersion Include="RichCodeNav.EnvVarDump" Version="0.1.1643-alpha" />
<PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="$(RoslynDiagnosticsNugetPackageVersion)" />
Expand Down
9 changes: 9 additions & 0 deletions eng/InternalTools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
$(RestoreSources);
https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json
</RestoreSources>

<!-- Workaround for https://github.com/dotnet/dnceng/issues/4441. -->
<RestoreSources Condition="'$(ForceAzureComSources)' == 'true'">
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
</RestoreSources>
</PropertyGroup>

<ItemGroup Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/test-windows-job-single-machine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
8 changes: 4 additions & 4 deletions src/CodeStyle/Tools/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ and an implied numerical option (such as '4') -->
'$(AnalysisLevelStyle)' != ''">$(AnalysisLevelStyle)</EffectiveAnalysisLevelStyle>

<!-- Set the default analysis mode, if not set by the user -->
<_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle>$(AnalysisLevelSuffixStyle)</_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle>
<_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle Condition="'$(_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle)' == ''">$(AnalysisModeStyle)</_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle>
<_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle>$(AnalysisModeStyle)</_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle>
<_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle Condition="'$(_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle)' == ''">$(AnalysisLevelSuffixStyle)</_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle>
<_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle Condition="'$(_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle)' == 'AllEnabledByDefault'">{nameof(AnalysisMode.All)}</_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle>
<_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle Condition="'$(_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle)' == 'AllDisabledByDefault'">{nameof(AnalysisMode.None)}</_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle>
<_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle Condition="'$(_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle)' == ''">{nameof(AnalysisMode.Default)}</_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle>
Expand All @@ -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)</_GlobalAnalyzerConfigFile_MicrosoftCodeAnalysis{language}CodeStyle>
</PropertyGroup>

<!-- From .NET 9, the global config is systematically added if the file exists. Please check https://github.com/dotnet/roslyn/pull/71173 for more info. -->
<!-- From .NET 10, the global config is systematically added if the file exists. Please check https://github.com/dotnet/roslyn/pull/71173 for more info. -->
<ItemGroup Condition="Exists('$(_GlobalAnalyzerConfigFile_MicrosoftCodeAnalysis{language}CodeStyle)') and
('$(AnalysisLevelStyle)' != '$(AnalysisLevel)' or '$(AnalysisModeStyle)' != '$(AnalysisMode)' or ('$(EffectiveAnalysisLevelStyle)' != '' and $([MSBuild]::VersionGreaterThanOrEquals('$(EffectiveAnalysisLevelStyle)', '9.0'))))">
('$(AnalysisLevelStyle)' != '$(AnalysisLevel)' or '$(AnalysisModeStyle)' != '$(AnalysisMode)' or ('$(EffectiveAnalysisLevelStyle)' != '' and $([MSBuild]::VersionGreaterThanOrEquals('$(EffectiveAnalysisLevelStyle)', '10.0'))))">
<EditorConfigFiles Include="$(_GlobalAnalyzerConfigFile_MicrosoftCodeAnalysis{language}CodeStyle)" />
</ItemGroup>

Expand Down
Loading