Skip to content

Commit 4f45bc4

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into darc-release/9.0.3xx-3247e2e2-42f0-4386-8cc4-c621db7f4d37
2 parents abce31a + 05e1d63 commit 4f45bc4

File tree

7 files changed

+84
-70
lines changed

7 files changed

+84
-70
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
<!-- Begin: Package sources from dotnet-runtime -->
3636
<!-- End: Package sources from dotnet-runtime -->
3737
<!-- Begin: Package sources from dotnet-templating -->
38-
<add key="darc-pub-dotnet-templating-813004f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-813004f3/nuget/v3/index.json" />
39-
<add key="darc-pub-dotnet-templating-813004f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-813004f3-2/nuget/v3/index.json" />
40-
<add key="darc-pub-dotnet-templating-813004f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-813004f3-1/nuget/v3/index.json" />
38+
<add key="darc-pub-dotnet-templating-b252e94" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b252e948/nuget/v3/index.json" />
4139
<!-- End: Package sources from dotnet-templating -->
4240
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4341
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.305">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>813004f34facff303de42c491635dc8820c495b5</Sha>
6+
<Sha>b252e9480d0f759f471ed9e53e02aa3506ff1ebc</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.305-servicing.25417.11">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.305-servicing.25458.1">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>813004f34facff303de42c491635dc8820c495b5</Sha>
10+
<Sha>b252e9480d0f759f471ed9e53e02aa3506ff1ebc</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
1313
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.300-preview.25209.5">
@@ -93,43 +93,43 @@
9393
<Sha>14987c804f33917bf15f4c25e0cd16ecd01807f4</Sha>
9494
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9595
</Dependency>
96-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25413.5">
96+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25429.5">
9797
<Uri>https://github.com/dotnet/roslyn</Uri>
98-
<Sha>b828a8df198e360ec03e3f1fb9f6d149eb563ddc</Sha>
98+
<Sha>abf2d47471ab515fb98601c40dfa5d4869f0e25b</Sha>
9999
</Dependency>
100100
<!-- Intermediate is necessary for source build. -->
101-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25413.5">
101+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25429.5">
102102
<Uri>https://github.com/dotnet/roslyn</Uri>
103-
<Sha>b828a8df198e360ec03e3f1fb9f6d149eb563ddc</Sha>
103+
<Sha>abf2d47471ab515fb98601c40dfa5d4869f0e25b</Sha>
104104
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
105105
</Dependency>
106-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25413.5">
106+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25429.5">
107107
<Uri>https://github.com/dotnet/roslyn</Uri>
108-
<Sha>b828a8df198e360ec03e3f1fb9f6d149eb563ddc</Sha>
108+
<Sha>abf2d47471ab515fb98601c40dfa5d4869f0e25b</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25413.5">
110+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25429.5">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>b828a8df198e360ec03e3f1fb9f6d149eb563ddc</Sha>
112+
<Sha>abf2d47471ab515fb98601c40dfa5d4869f0e25b</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25413.5">
114+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25429.5">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>b828a8df198e360ec03e3f1fb9f6d149eb563ddc</Sha>
116+
<Sha>abf2d47471ab515fb98601c40dfa5d4869f0e25b</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25413.5">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25429.5">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>b828a8df198e360ec03e3f1fb9f6d149eb563ddc</Sha>
120+
<Sha>abf2d47471ab515fb98601c40dfa5d4869f0e25b</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25413.5">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25429.5">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>b828a8df198e360ec03e3f1fb9f6d149eb563ddc</Sha>
124+
<Sha>abf2d47471ab515fb98601c40dfa5d4869f0e25b</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25413.5">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25429.5">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>b828a8df198e360ec03e3f1fb9f6d149eb563ddc</Sha>
128+
<Sha>abf2d47471ab515fb98601c40dfa5d4869f0e25b</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25413.5">
130+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25429.5">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>b828a8df198e360ec03e3f1fb9f6d149eb563ddc</Sha>
132+
<Sha>abf2d47471ab515fb98601c40dfa5d4869f0e25b</Sha>
133133
</Dependency>
134134
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.8-servicing.25368.8">
135135
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -208,22 +208,22 @@
208208
<Uri>https://github.com/nuget/nuget.client</Uri>
209209
<Sha>0da03caba83448ee887f0f1846dd05e1f1705d45</Sha>
210210
</Dependency>
211-
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.14.1-release-25411-02">
211+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.14.1-release-25428-01">
212212
<Uri>https://github.com/microsoft/vstest</Uri>
213-
<Sha>4ac9f0d4d2df494076374c8f8943155e1b24fef3</Sha>
213+
<Sha>51441adcd6c424ae7315d66ce7e96baf34d70369</Sha>
214214
</Dependency>
215-
<Dependency Name="Microsoft.TestPlatform.CLI" Version="17.14.1-release-25411-02">
215+
<Dependency Name="Microsoft.TestPlatform.CLI" Version="17.14.1-release-25428-01">
216216
<Uri>https://github.com/microsoft/vstest</Uri>
217-
<Sha>4ac9f0d4d2df494076374c8f8943155e1b24fef3</Sha>
217+
<Sha>51441adcd6c424ae7315d66ce7e96baf34d70369</Sha>
218218
</Dependency>
219-
<Dependency Name="Microsoft.TestPlatform.Build" Version="17.14.1-release-25411-02">
219+
<Dependency Name="Microsoft.TestPlatform.Build" Version="17.14.1-release-25428-01">
220220
<Uri>https://github.com/microsoft/vstest</Uri>
221-
<Sha>4ac9f0d4d2df494076374c8f8943155e1b24fef3</Sha>
221+
<Sha>51441adcd6c424ae7315d66ce7e96baf34d70369</Sha>
222222
</Dependency>
223223
<!-- Intermediate is necessary for source build. -->
224-
<Dependency Name="Microsoft.SourceBuild.Intermediate.vstest" Version="17.14.1-release-25411-02">
224+
<Dependency Name="Microsoft.SourceBuild.Intermediate.vstest" Version="17.14.1-release-25428-01">
225225
<Uri>https://github.com/microsoft/vstest</Uri>
226-
<Sha>4ac9f0d4d2df494076374c8f8943155e1b24fef3</Sha>
226+
<Sha>51441adcd6c424ae7315d66ce7e96baf34d70369</Sha>
227227
<SourceBuild RepoName="vstest" ManagedOnly="true" />
228228
</Dependency>
229229
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.8">
@@ -378,9 +378,9 @@
378378
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
379379
<Sha>433fa3e4a54010fcac6e8843460e29d33ba07eb7</Sha>
380380
</Dependency>
381-
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25413.5">
381+
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25429.5">
382382
<Uri>https://github.com/dotnet/roslyn</Uri>
383-
<Sha>b828a8df198e360ec03e3f1fb9f6d149eb563ddc</Sha>
383+
<Sha>abf2d47471ab515fb98601c40dfa5d4869f0e25b</Sha>
384384
</Dependency>
385385
<!-- Intermediate is necessary for source build. -->
386386
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="9.0.0-preview.25424.3">
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25415.3">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25428.3">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
560+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25415.3">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25428.3">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
564+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25415.3">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25428.3">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
568+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25415.3">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25428.3">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
572+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25415.3">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25428.3">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
576+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25415.3">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25428.3">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
580+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25415.3">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25428.3">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
585+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.8">

‎eng/Versions.props‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>3</VersionSDKMinor>
9-
<VersionFeature>05</VersionFeature>
9+
<VersionFeature>06</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -154,14 +154,14 @@
154154
</PropertyGroup>
155155
<PropertyGroup>
156156
<!-- Dependencies from https://github.com/Microsoft/vstest -->
157-
<MicrosoftNETTestSdkPackageVersion>17.14.1-release-25411-02</MicrosoftNETTestSdkPackageVersion>
158-
<MicrosoftTestPlatformCLIPackageVersion>17.14.1-release-25411-02</MicrosoftTestPlatformCLIPackageVersion>
159-
<MicrosoftTestPlatformBuildPackageVersion>17.14.1-release-25411-02</MicrosoftTestPlatformBuildPackageVersion>
157+
<MicrosoftNETTestSdkPackageVersion>17.14.1-release-25428-01</MicrosoftNETTestSdkPackageVersion>
158+
<MicrosoftTestPlatformCLIPackageVersion>17.14.1-release-25428-01</MicrosoftTestPlatformCLIPackageVersion>
159+
<MicrosoftTestPlatformBuildPackageVersion>17.14.1-release-25428-01</MicrosoftTestPlatformBuildPackageVersion>
160160
</PropertyGroup>
161161
<PropertyGroup>
162162
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
163-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25424.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
164-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25413.5</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
163+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25329.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
164+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25429.5</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
165165
</PropertyGroup>
166166
<PropertyGroup>
167167
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -195,7 +195,7 @@
195195
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
196196
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
197197
<!-- test dependencies -->
198-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.305-servicing.25417.11</MicrosoftTemplateEngineMocksPackageVersion>
198+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.305-servicing.25458.1</MicrosoftTemplateEngineMocksPackageVersion>
199199
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
200200
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
201201
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -206,14 +206,14 @@
206206
</PropertyGroup>
207207
<PropertyGroup>
208208
<!-- Dependencies from https://github.com/dotnet/roslyn -->
209-
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.25413.5</MicrosoftNetCompilersToolsetVersion>
210-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.14.0-3.25413.5</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
211-
<MicrosoftCodeAnalysisPackageVersion>4.14.0-3.25413.5</MicrosoftCodeAnalysisPackageVersion>
212-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25413.5</MicrosoftCodeAnalysisCSharpPackageVersion>
213-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-3.25413.5</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
214-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25413.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
215-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25413.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
216-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25413.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
209+
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.25429.5</MicrosoftNetCompilersToolsetVersion>
210+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.14.0-3.25429.5</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
211+
<MicrosoftCodeAnalysisPackageVersion>4.14.0-3.25429.5</MicrosoftCodeAnalysisPackageVersion>
212+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25429.5</MicrosoftCodeAnalysisCSharpPackageVersion>
213+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-3.25429.5</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
214+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25429.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
215+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25429.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
216+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25429.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
217217
</PropertyGroup>
218218
<PropertyGroup>
219219
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -272,10 +272,10 @@
272272
</PropertyGroup>
273273
<PropertyGroup>
274274
<!-- Dependencies from https://github.com/dotnet/arcade -->
275-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25415.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25415.3</MicrosoftDotNetSignToolVersion>
277-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25415.3</MicrosoftDotNetXliffTasksVersion>
278-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25415.3</MicrosoftDotNetXUnitExtensionsVersion>
275+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25428.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25428.3</MicrosoftDotNetSignToolVersion>
277+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25428.3</MicrosoftDotNetXliffTasksVersion>
278+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25428.3</MicrosoftDotNetXUnitExtensionsVersion>
279279
</PropertyGroup>
280280
<PropertyGroup>
281281
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ parameters:
3333
# container and pool.
3434
platform: {}
3535

36+
# Optional list of directories to ignore for component governance scans.
37+
componentGovernanceIgnoreDirectories: []
38+
3639
is1ESPipeline: ''
3740

3841
# If set to true and running on a non-public project,
@@ -93,3 +96,4 @@ jobs:
9396
parameters:
9497
is1ESPipeline: ${{ parameters.is1ESPipeline }}
9598
platform: ${{ parameters.platform }}
99+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

‎eng/common/core-templates/jobs/source-build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ parameters:
2121
# one job runs on 'defaultManagedPlatform'.
2222
platforms: []
2323

24+
# Optional list of directories to ignore for component governance scans.
25+
componentGovernanceIgnoreDirectories: []
26+
2427
is1ESPipeline: ''
2528

2629
# If set to true and running on a non-public project,
@@ -47,6 +50,7 @@ jobs:
4750
is1ESPipeline: ${{ parameters.is1ESPipeline }}
4851
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4952
platform: ${{ platform }}
53+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
5054
enableInternalSources: ${{ parameters.enableInternalSources }}
5155

5256
- ${{ if eq(length(parameters.platforms), 0) }}:
@@ -55,4 +59,5 @@ jobs:
5559
is1ESPipeline: ${{ parameters.is1ESPipeline }}
5660
jobNamePrefix: ${{ parameters.jobNamePrefix }}
5761
platform: ${{ parameters.defaultManagedPlatform }}
62+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
5863
enableInternalSources: ${{ parameters.enableInternalSources }}

‎eng/common/core-templates/steps/source-build.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ parameters:
1111
# for details. The entire object is described in the 'job' template for simplicity, even though
1212
# the usage of the properties on this object is split between the 'job' and 'steps' templates.
1313
platform: {}
14+
15+
# Optional list of directories to ignore for component governance scans.
16+
componentGovernanceIgnoreDirectories: []
17+
1418
is1ESPipeline: false
1519

1620
steps:
@@ -126,5 +130,8 @@ steps:
126130
parameters:
127131
displayName: Component Detection (Exclude upstream cache)
128132
is1ESPipeline: ${{ parameters.is1ESPipeline }}
129-
componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
133+
${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}:
134+
componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
135+
${{ else }}:
136+
componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }}
130137
disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25415.3",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25428.3",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)