Skip to content

Commit c28a176

Browse files
akoeplingerakoeplinger
authored
Merge branch 'main' into merge/release/9.0.3xx-to-main
2 parents d9a24aa + 27b91ce commit c28a176

Some content is hidden

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

44 files changed

+538
-155
lines changed

‎.github/workflows/pr-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: PR Analysis
22
on:
3-
pull_request:
3+
pull_request_target:
44
types: [opened, synchronize, labeled, unlabeled]
55
permissions:
66
contents: read

‎.github/workflows/remove-lockdown-label.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Remove Lockdown Label from PRs
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
types: [closed]
66

77
permissions:
@@ -13,9 +13,6 @@ jobs:
1313
if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'Branding')
1414
runs-on: ubuntu-latest
1515
steps:
16-
- name: Checkout repository
17-
uses: actions/checkout@v2
18-
1916
- name: PR's only change is <VersionFeature> in eng/Versions.props
2017
id: only_version_feature_changed
2118
uses: actions/github-script@v4

‎build.cmd‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ echo %* | findstr /C:"-pack" >nul
44
if %errorlevel%==0 (
55
set SkipBuildingInstallers=
66
) else (
7-
REM disable crossgen for inner-loop builds to save a ton of time
8-
set SkipBuildingInstallers=/p:SkipBuildingInstallers=true
9-
set DISABLE_CROSSGEN=true
7+
REM skip crossgen for inner-loop builds to save a ton of time
8+
set skipFlags="/p:SkipUsingCrossgen=true /p:SkipBuildingInstallers=true"
109
)
11-
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -msbuildEngine dotnet %SkipBuildingInstallers% %*"
10+
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -msbuildEngine dotnet %skipFlags% %*"
1211
exit /b %ErrorLevel%

‎build.sh‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ done
99
ScriptRoot="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1010

1111
if [[ "$@" != *"-pack"* ]]; then
12-
# disable crossgen for inner-loop builds to save a ton of time
13-
export DISABLE_CROSSGEN=true
14-
skipBuildingInstallersFlag="/p:SkipBuildingInstallers=true"
15-
else
16-
skipBuildingInstallersFlag=
12+
# skip crossgen for inner-loop builds to save a ton of time
13+
skipFlags="/p:SkipUsingCrossgen=true /p:SkipBuildingInstallers=true"
1714
fi
1815

19-
. "$ScriptRoot/eng/common/build.sh" --build --restore $skipBuildingInstallersFlag "$@"
16+
. "$ScriptRoot/eng/common/build.sh" --build --restore $skipFlags "$@"

‎eng/Version.Details.xml‎

Lines changed: 54 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="10.0.100-preview.4.25210.1">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="10.0.100-preview.4.25210.6">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>6ad696d38960aaee5eacb3b22c5c546c33750119</Sha>
6+
<Sha>6613a3928cf3678ae605024dbbba168833a2ddd5</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Edge" Version="10.0.100-preview.4.25210.1">
8+
<Dependency Name="Microsoft.TemplateEngine.Edge" Version="10.0.100-preview.4.25210.6">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>6ad696d38960aaee5eacb3b22c5c546c33750119</Sha>
10+
<Sha>6613a3928cf3678ae605024dbbba168833a2ddd5</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="10.0.100-preview.4.25210.1">
12+
<Dependency Name="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="10.0.100-preview.4.25210.6">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>6ad696d38960aaee5eacb3b22c5c546c33750119</Sha>
14+
<Sha>6613a3928cf3678ae605024dbbba168833a2ddd5</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.TemplateEngine.Utils" Version="10.0.100-preview.4.25210.1">
16+
<Dependency Name="Microsoft.TemplateEngine.Utils" Version="10.0.100-preview.4.25210.6">
1717
<Uri>https://github.com/dotnet/templating</Uri>
18-
<Sha>6ad696d38960aaee5eacb3b22c5c546c33750119</Sha>
18+
<Sha>6613a3928cf3678ae605024dbbba168833a2ddd5</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.TemplateSearch.Common" Version="10.0.100-preview.4.25210.1">
20+
<Dependency Name="Microsoft.TemplateSearch.Common" Version="10.0.100-preview.4.25210.6">
2121
<Uri>https://github.com/dotnet/templating</Uri>
22-
<Sha>6ad696d38960aaee5eacb3b22c5c546c33750119</Sha>
22+
<Sha>6613a3928cf3678ae605024dbbba168833a2ddd5</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="10.0.100-preview.4.25210.1">
24+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="10.0.100-preview.4.25210.6">
2525
<Uri>https://github.com/dotnet/templating</Uri>
26-
<Sha>6ad696d38960aaee5eacb3b22c5c546c33750119</Sha>
26+
<Sha>6613a3928cf3678ae605024dbbba168833a2ddd5</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.TemplateEngine.TestHelper" Version="10.0.100-preview.4.25210.1">
28+
<Dependency Name="Microsoft.TemplateEngine.TestHelper" Version="10.0.100-preview.4.25210.6">
2929
<Uri>https://github.com/dotnet/templating</Uri>
30-
<Sha>6ad696d38960aaee5eacb3b22c5c546c33750119</Sha>
30+
<Sha>6613a3928cf3678ae605024dbbba168833a2ddd5</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.TemplateEngine.Authoring.TemplateVerifier" Version="10.0.100-preview.4.25210.1">
32+
<Dependency Name="Microsoft.TemplateEngine.Authoring.TemplateVerifier" Version="10.0.100-preview.4.25210.6">
3333
<Uri>https://github.com/dotnet/templating</Uri>
34-
<Sha>6ad696d38960aaee5eacb3b22c5c546c33750119</Sha>
34+
<Sha>6613a3928cf3678ae605024dbbba168833a2ddd5</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.TemplateSearch.TemplateDiscovery" Version="10.0.100-preview.4.25210.1">
36+
<Dependency Name="Microsoft.TemplateSearch.TemplateDiscovery" Version="10.0.100-preview.4.25210.6">
3737
<Uri>https://github.com/dotnet/templating</Uri>
38-
<Sha>6ad696d38960aaee5eacb3b22c5c546c33750119</Sha>
38+
<Sha>6613a3928cf3678ae605024dbbba168833a2ddd5</Sha>
3939
</Dependency>
4040
<!-- Intermediate is necessary for source build. -->
41-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="10.0.100-preview.4.25210.1">
41+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="10.0.100-preview.4.25210.6">
4242
<Uri>https://github.com/dotnet/templating</Uri>
43-
<Sha>6ad696d38960aaee5eacb3b22c5c546c33750119</Sha>
43+
<Sha>6613a3928cf3678ae605024dbbba168833a2ddd5</Sha>
4444
<SourceBuild RepoName="templating" ManagedOnly="true" />
4545
</Dependency>
4646
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.4.25210.5">
@@ -125,47 +125,47 @@
125125
<Sha>4ba36db1f42f33a66d9677f0b9d589d39b204a9c</Sha>
126126
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
127127
</Dependency>
128-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25209.15">
128+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25211.1">
129129
<Uri>https://github.com/dotnet/roslyn</Uri>
130-
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
130+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
131131
</Dependency>
132132
<!-- Intermediate is necessary for source build. -->
133-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="5.0.0-1.25209.15">
133+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="5.0.0-1.25211.1">
134134
<Uri>https://github.com/dotnet/roslyn</Uri>
135-
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
135+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
136136
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
137137
</Dependency>
138-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="5.0.0-1.25209.15">
138+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="5.0.0-1.25211.1">
139139
<Uri>https://github.com/dotnet/roslyn</Uri>
140-
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
140+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
141141
</Dependency>
142-
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25209.15">
142+
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25211.1">
143143
<Uri>https://github.com/dotnet/roslyn</Uri>
144-
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
144+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
145145
</Dependency>
146-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25209.15">
146+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25211.1">
147147
<Uri>https://github.com/dotnet/roslyn</Uri>
148-
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
148+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
149149
</Dependency>
150-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="5.0.0-1.25209.15">
150+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="5.0.0-1.25211.1">
151151
<Uri>https://github.com/dotnet/roslyn</Uri>
152-
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
152+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
153153
</Dependency>
154-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25209.15">
154+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25211.1">
155155
<Uri>https://github.com/dotnet/roslyn</Uri>
156-
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
156+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25209.15">
158+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25211.1">
159159
<Uri>https://github.com/dotnet/roslyn</Uri>
160-
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
160+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
161161
</Dependency>
162-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25209.15">
162+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25211.1">
163163
<Uri>https://github.com/dotnet/roslyn</Uri>
164-
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
164+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25209.15">
166+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25211.1">
167167
<Uri>https://github.com/dotnet/roslyn</Uri>
168-
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
168+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
169169
</Dependency>
170170
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.102">
171171
<Uri>https://github.com/nuget/nuget.client</Uri>
@@ -278,22 +278,22 @@
278278
<Uri>https://github.com/dotnet/runtime</Uri>
279279
<Sha>7618121e0f64098e2b81ed7c8cdf7024a1b87795</Sha>
280280
</Dependency>
281-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.4.25210.1">
281+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.4.25210.4">
282282
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
283-
<Sha>519ec8612f1a7f85eec2fd071fc8198a07b6cabb</Sha>
283+
<Sha>6b8edd48cef2853ab9d0940fea2083d0872c500b</Sha>
284284
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
285285
</Dependency>
286-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25210.1">
286+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25210.4">
287287
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
288-
<Sha>519ec8612f1a7f85eec2fd071fc8198a07b6cabb</Sha>
288+
<Sha>6b8edd48cef2853ab9d0940fea2083d0872c500b</Sha>
289289
</Dependency>
290-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.4.25210.1">
290+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.4.25210.4">
291291
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
292-
<Sha>519ec8612f1a7f85eec2fd071fc8198a07b6cabb</Sha>
292+
<Sha>6b8edd48cef2853ab9d0940fea2083d0872c500b</Sha>
293293
</Dependency>
294-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.4.25210.1">
294+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.4.25210.4">
295295
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
296-
<Sha>519ec8612f1a7f85eec2fd071fc8198a07b6cabb</Sha>
296+
<Sha>6b8edd48cef2853ab9d0940fea2083d0872c500b</Sha>
297297
</Dependency>
298298
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.4.25210.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
299299
<Uri>https://github.com/dotnet/wpf</Uri>
@@ -467,9 +467,9 @@
467467
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
468468
<Sha>d98c60c0da655de406d3c45d0c82bfd82cc15a66</Sha>
469469
</Dependency>
470-
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25209.15">
470+
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25211.1">
471471
<Uri>https://github.com/dotnet/roslyn</Uri>
472-
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
472+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
473473
</Dependency>
474474
<!-- Intermediate is necessary for source build. -->
475475
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.12.0-beta1.25177.1">
@@ -690,16 +690,6 @@
690690
<Uri>https://github.com/dotnet/arcade-services</Uri>
691691
<Sha>98b747c01a9f431a5676a6ecf6ab2cf272ce69ee</Sha>
692692
</Dependency>
693-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="10.0.0-preview.24602.1">
694-
<Uri>https://github.com/dotnet/scenario-tests</Uri>
695-
<Sha>61173bbe1b4ab5f60e760cca9c5fd7eae6e48546</Sha>
696-
</Dependency>
697-
<!-- Intermediate is necessary for source build. -->
698-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="10.0.0-preview.24602.1">
699-
<Uri>https://github.com/dotnet/scenario-tests</Uri>
700-
<Sha>61173bbe1b4ab5f60e760cca9c5fd7eae6e48546</Sha>
701-
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
702-
</Dependency>
703693
<!--
704694
Aspire isn't really a toolset dependency. However, it only inserts a baseline manifest in sdk,
705695
and if you squint at it, this means we can say that its specific dependency versions don't matter to sdk.
@@ -719,13 +709,13 @@
719709
<Sha>5fa9337a84a52e9bd185d04d156eccbdcf592f74</Sha>
720710
<SourceBuild RepoName="aspire" ManagedOnly="true" />
721711
</Dependency>
722-
<Dependency Name="Microsoft.Testing.Platform" Version="1.7.0-preview.25209.3">
712+
<Dependency Name="Microsoft.Testing.Platform" Version="1.7.0-preview.25210.9">
723713
<Uri>https://github.com/microsoft/testfx</Uri>
724-
<Sha>c4b543d35d6ae0e11cb0471b1d2a47330b153f6a</Sha>
714+
<Sha>35fc2e38b23affdd1dbde364beb32dea42329abd</Sha>
725715
</Dependency>
726-
<Dependency Name="MSTest" Version="3.9.0-preview.25209.3">
716+
<Dependency Name="MSTest" Version="3.9.0-preview.25210.9">
727717
<Uri>https://github.com/microsoft/testfx</Uri>
728-
<Sha>c4b543d35d6ae0e11cb0471b1d2a47330b153f6a</Sha>
718+
<Sha>35fc2e38b23affdd1dbde364beb32dea42329abd</Sha>
729719
</Dependency>
730720
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-preview.4.25210.5">
731721
<Uri>https://github.com/dotnet/runtime</Uri>

0 commit comments

Comments
 (0)