Skip to content

Commit 77d763f

Browse files
ViktorHoferViktorHofer
authored
Merge branch 'release/9.0.2xx' => 'main' (#45427)
2 parents 124be38 + 21b0299 commit 77d763f

File tree

659 files changed

+18377
-3410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

659 files changed

+18377
-3410
lines changed

‎.vsts-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ extends:
9393
parameters:
9494
pool:
9595
name: $(DncEngInternalBuildPool)
96-
image: 1es-windows-2022
96+
image: windows.vs2022.amd64
9797
os: windows
9898
helixTargetQueue: windows.amd64.vs2022.pre
9999
oneESCompat:
100100
templateFolderName: templates-official
101101
publishTaskPrefix: 1ES.
102102
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
103-
locBranch: release/9.0.1xx
103+
locBranch: release/9.0.2xx
104104
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
105105
timeoutInMinutes: 90
106106
windowsJobParameterSets:

‎CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
/src/Cli/dotnet/commands/dotnet-vstest @dotnet/dotnet-testing-admin
5151
/test/dotnet-test.Tests @dotnet/dotnet-testing-admin
5252
/test/dotnet-vstest.Tests @dotnet/dotnet-testing-admin
53+
/test/dotnet-new.Tests @dotnet/dotnet-testing-admin
54+
/template_feed/Microsoft.DotNet.Common.*/content/MSTest* @dotnet/dotnet-testing-admin
55+
/template_feed/Microsoft.DotNet.Common.*/content/NUnit* @dotnet/dotnet-testing-admin
56+
/template_feed/Microsoft.DotNet.Common.*/content/XUnit* @dotnet/dotnet-testing-admin
5357

5458
# Area-Templates
5559
/src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers

‎eng/ManualVersions.props

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
Basically: In this file, choose the highest version when resolving merge conflicts.
1010
-->
1111
<PropertyGroup>
12-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.54</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.54</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.54</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.54</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.54</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.54</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18-
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.54</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
19-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.52</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
20-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.52</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
21-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.52</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
22-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.52</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
23-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.52</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
24-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.52</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
25-
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.52</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
12+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.57</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.57</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.57</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.57</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.57</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.57</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.57</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
19+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.55</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
20+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.55</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
21+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.55</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
22+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.55</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
23+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.55</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
24+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.55</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
25+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.55</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
2626
</PropertyGroup>
2727

2828
</Project>

‎eng/Version.Details.xml

Lines changed: 18 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -97,43 +97,43 @@
9797
<Sha>5af96504f10836eca6ce804ab3cdd28c042fa35a</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-2.24561.1">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.24603.5">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
102+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-2.24561.1">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.24603.5">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
107+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-2.24561.1">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.24603.5">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
112+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-2.24561.1">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.24603.5">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
116+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-2.24561.1">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.24603.5">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
120+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-2.24561.1">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.24603.5">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
124+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-2.24561.1">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.24603.5">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
128+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-2.24561.1">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.24603.5">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
132+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-2.24561.1">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.24603.5">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
136+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.24617.2">
139139
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -359,36 +359,6 @@
359359
<Uri>https://github.com/dotnet/aspnetcore</Uri>
360360
<Sha>6ae3ea387b20f6497b82897d613e9b8a6e31d69c</Sha>
361361
</Dependency>
362-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
363-
<Uri>https://github.com/dotnet/test-templates</Uri>
364-
<Sha>0385265f4d0b6413d64aea0223172366a9b9858c</Sha>
365-
</Dependency>
366-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.1.0-rc.23558.1">
367-
<Uri>https://github.com/dotnet/test-templates</Uri>
368-
<Sha>307b8f538d83a955d8f6dd909eee41a5555f2f4d</Sha>
369-
</Dependency>
370-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.1.0-rc.24069.1">
371-
<Uri>https://github.com/dotnet/test-templates</Uri>
372-
<Sha>becc4bd157cd6608b51a5ffe414a5d2de6330272</Sha>
373-
</Dependency>
374-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.1.0-rc.24069.1">
375-
<Uri>https://github.com/dotnet/test-templates</Uri>
376-
<Sha>becc4bd157cd6608b51a5ffe414a5d2de6330272</Sha>
377-
</Dependency>
378-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.8.0" Version="1.1.0-rc.24202.1">
379-
<Uri>https://github.com/dotnet/test-templates</Uri>
380-
<Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
381-
</Dependency>
382-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rtm.24576.1">
383-
<Uri>https://github.com/dotnet/test-templates</Uri>
384-
<Sha>01712257e7ac9363b002637d399206fd93fc724b</Sha>
385-
</Dependency>
386-
<!-- Intermediate is necessary for source build. -->
387-
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rtm.24576.1">
388-
<Uri>https://github.com/dotnet/test-templates</Uri>
389-
<Sha>01712257e7ac9363b002637d399206fd93fc724b</Sha>
390-
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
391-
</Dependency>
392362
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
393363
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-alpha.1.24605.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
394364
<Uri>https://github.com/dotnet/winforms</Uri>

‎eng/Versions.props

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,14 @@
3434
<VersionFeature21>30</VersionFeature21>
3535
<VersionFeature31>32</VersionFeature31>
3636
<VersionFeature50>17</VersionFeature50>
37-
<VersionFeature60>35</VersionFeature60>
37+
<VersionFeature60>36</VersionFeature60>
3838
<VersionFeature70>20</VersionFeature70>
39-
<VersionFeature80>10</VersionFeature80>
39+
<VersionFeature80>11</VersionFeature80>
4040
<VersionFeature90>0</VersionFeature90>
4141
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
4242
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4343
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
4444
</PropertyGroup>
45-
<PropertyGroup Label="AspNetCore template versioning">
46-
<!-- Automated versions for asp.net templates -->
47-
<MicrosoftNETSdkPatchVersion>$(VersionFeature)</MicrosoftNETSdkPatchVersion>
48-
<!--
49-
Between branding and shipping, the templates should stay at last month's version.
50-
If the incoming SDK version is 2 versions behind us, we know we just branded but haven't done the internal -> public merge yet.
51-
Therefore we stay at last month's version.
52-
We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case.
53-
Instead the indicator is that the incoming SDK version is not RTM or greater yet.
54-
Preview releases already use -1 versionining so don't subtract one for that version.
55-
In public builds, we always use the 2 month old version.
56-
-->
57-
<SubtractOneFromTemplateVersions Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal'">true</SubtractOneFromTemplateVersions>
58-
<SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) &gt;= 2">true</SubtractOneFromTemplateVersions>
59-
<SubtractOneFromTemplateVersions Condition="$(VersionFeature) &gt;= 1 AND ! $(PreReleaseVersionLabel.Contains('rtm')) AND ! $(PreReleaseVersionLabel.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
60-
</PropertyGroup>
6145
<PropertyGroup Label="Restore feeds">
6246
<!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
6347
<DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetbuilds.blob.core.windows.net/public/</DotNetAssetRootUrl>
@@ -94,13 +78,12 @@
9478
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24613.2</MicrosoftDotNetDarcLibVersion>
9579
</PropertyGroup>
9680
<PropertyGroup>
97-
<!-- Dependency from https://github.com/dotnet/winforms -->
98-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24605.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
81+
<!-- Dependency from https://github.com/dotnet/aspire -->
82+
<AspirePackageVersion>9.1.0-preview.1.24555.3</AspirePackageVersion>
9983
</PropertyGroup>
10084
<PropertyGroup>
101-
<!-- Dependency from https://github.com/dotnet/test-templates -->
102-
<!-- Supported versions -->
103-
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24576.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
85+
<!-- Dependency from https://github.com/dotnet/winforms -->
86+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24605.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
10487
</PropertyGroup>
10588
<PropertyGroup>
10689
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -192,14 +175,16 @@
192175
193176
Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older
194177
than the very latest, based on what we want the SDK to support. So use a version that matches the version
195-
in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0
196-
to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release.
178+
in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0
179+
to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release.
197180
In these cases, we don't want to use MicrosoftBuildVersion and other
198181
associated properties that are updated by the VMR infrastructure. So, we read this version
199182
from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion,
200183
then use that in Directory.Packages.props.
201184
202-
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
185+
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
186+
187+
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
203188
<MicrosoftBuildVersion>17.13.0-preview-24612-02</MicrosoftBuildVersion>
204189
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24612-02</MicrosoftBuildLocalizationVersion>
205190
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
@@ -224,14 +209,14 @@
224209
</PropertyGroup>
225210
<PropertyGroup>
226211
<!-- Dependencies from https://github.com/dotnet/roslyn -->
227-
<MicrosoftNetCompilersToolsetVersion>4.13.0-2.24561.1</MicrosoftNetCompilersToolsetVersion>
228-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-2.24561.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
229-
<MicrosoftCodeAnalysisPackageVersion>4.13.0-2.24561.1</MicrosoftCodeAnalysisPackageVersion>
230-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-2.24561.1</MicrosoftCodeAnalysisCSharpPackageVersion>
231-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-2.24561.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
232-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-2.24561.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
233-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-2.24561.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
234-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-2.24561.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
212+
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.24603.5</MicrosoftNetCompilersToolsetVersion>
213+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.24603.5</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
214+
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisPackageVersion>
215+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisCSharpPackageVersion>
216+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
217+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
218+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
219+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
235220
</PropertyGroup>
236221
<PropertyGroup>
237222
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->

‎eng/pipelines/templates/jobs/sdk-job-matrix.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ parameters:
1212
runTestsAsTool: true
1313
# This job uses the build step for testing, so the extra test step is not necessary.
1414
runTests: false
15-
- categoryName: TemplateEngine
16-
testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
17-
publishXunitResults: true
15+
# Turn off template engine runs on Windows temporarily until agent images are updated
16+
#- categoryName: TemplateEngine
17+
# testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
18+
# publishXunitResults: true
1819
- categoryName: AoT
1920
runAoTTests: true
2021
### LINUX ###

‎eng/pipelines/templates/jobs/vmr-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ jobs:
200200
path: $(artifactsStagingDir)
201201
artifact: $(Agent.JobName)_Artifacts
202202
displayName: Publish Artifacts
203+
condition: succeededOrFailed()
203204
sbomEnabled: true
204205

205206
# Using build artifacts to enable publishing the vertical manifests to a single artifact from different jobs
@@ -573,6 +574,7 @@ jobs:
573574
- publish: $(artifactsStagingDir)
574575
artifact: $(Agent.JobName)_Artifacts
575576
displayName: Publish Artifacts
577+
condition: succeededOrFailed()
576578
continueOnError: true
577579

578580
# Using build artifacts to enable publishing the vertical manifests to a single artifact from different jobs

0 commit comments

Comments
 (0)