Skip to content

Commit e7aa57d

Browse files
YuliiaKovalovaYuliiaKovalova
authored
Merge branch 'main' into post-process-modify-json
2 parents ad027ef + e44f16d commit e7aa57d

File tree

12 files changed

+228
-271
lines changed

12 files changed

+228
-271
lines changed

‎.github/workflows/inter-branch-merge-flow.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Inter-branch merge workflow
2+
on:
3+
push:
4+
branches:
5+
- release/**
6+
7+
permissions:
8+
contents: write
9+
pull-requests: write
10+
11+
jobs:
12+
Merge:
13+
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main

‎eng/Version.Details.xml

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
</PropertyGroup>
120120
<PropertyGroup>
121121
<!-- Dependency from https://github.com/dotnet/winforms -->
122-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24329.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
122+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24355.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
123123
</PropertyGroup>
124124
<PropertyGroup>
125125
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -149,31 +149,31 @@
149149
</PropertyGroup>
150150
<PropertyGroup>
151151
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
152-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24352.8</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
153-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24352.8</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
154-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24352.8</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
155-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24352.8</MicrosoftWindowsDesktopAppRefPackageVersion>
152+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24356.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
153+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24356.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
154+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24356.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
155+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24356.1</MicrosoftWindowsDesktopAppRefPackageVersion>
156156
</PropertyGroup>
157157
<PropertyGroup>
158158
<!-- Dependencies from https://github.com/nuget/nuget.client -->
159-
<NuGetBuildTasksPackageVersion>6.11.0-rc.122</NuGetBuildTasksPackageVersion>
160-
<NuGetBuildTasksConsolePackageVersion>6.11.0-rc.122</NuGetBuildTasksConsolePackageVersion>
161-
<NuGetLocalizationPackageVersion>6.11.0-rc.122</NuGetLocalizationPackageVersion>
162-
<NuGetBuildTasksPackPackageVersion>6.11.0-rc.122</NuGetBuildTasksPackPackageVersion>
163-
<NuGetCommandLineXPlatPackageVersion>6.11.0-rc.122</NuGetCommandLineXPlatPackageVersion>
164-
<NuGetProjectModelPackageVersion>6.11.0-rc.122</NuGetProjectModelPackageVersion>
165-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.11.0-rc.122</MicrosoftBuildNuGetSdkResolverPackageVersion>
166-
<NuGetCommonPackageVersion>6.11.0-rc.122</NuGetCommonPackageVersion>
167-
<NuGetConfigurationPackageVersion>6.11.0-rc.122</NuGetConfigurationPackageVersion>
168-
<NuGetFrameworksPackageVersion>6.11.0-rc.122</NuGetFrameworksPackageVersion>
169-
<NuGetPackagingPackageVersion>6.11.0-rc.122</NuGetPackagingPackageVersion>
170-
<NuGetVersioningPackageVersion>6.11.0-rc.122</NuGetVersioningPackageVersion>
159+
<NuGetBuildTasksPackageVersion>6.12.0-preview.1.12</NuGetBuildTasksPackageVersion>
160+
<NuGetBuildTasksConsolePackageVersion>6.12.0-preview.1.12</NuGetBuildTasksConsolePackageVersion>
161+
<NuGetLocalizationPackageVersion>6.12.0-preview.1.12</NuGetLocalizationPackageVersion>
162+
<NuGetBuildTasksPackPackageVersion>6.12.0-preview.1.12</NuGetBuildTasksPackPackageVersion>
163+
<NuGetCommandLineXPlatPackageVersion>6.12.0-preview.1.12</NuGetCommandLineXPlatPackageVersion>
164+
<NuGetProjectModelPackageVersion>6.12.0-preview.1.12</NuGetProjectModelPackageVersion>
165+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.12.0-preview.1.12</MicrosoftBuildNuGetSdkResolverPackageVersion>
166+
<NuGetCommonPackageVersion>6.12.0-preview.1.12</NuGetCommonPackageVersion>
167+
<NuGetConfigurationPackageVersion>6.12.0-preview.1.12</NuGetConfigurationPackageVersion>
168+
<NuGetFrameworksPackageVersion>6.12.0-preview.1.12</NuGetFrameworksPackageVersion>
169+
<NuGetPackagingPackageVersion>6.12.0-preview.1.12</NuGetPackagingPackageVersion>
170+
<NuGetVersioningPackageVersion>6.12.0-preview.1.12</NuGetVersioningPackageVersion>
171171
</PropertyGroup>
172172
<PropertyGroup>
173173
<!-- Dependencies from https://github.com/Microsoft/vstest -->
174-
<MicrosoftNETTestSdkPackageVersion>17.11.0-preview-24320-06</MicrosoftNETTestSdkPackageVersion>
175-
<MicrosoftTestPlatformCLIPackageVersion>17.11.0-preview-24320-06</MicrosoftTestPlatformCLIPackageVersion>
176-
<MicrosoftTestPlatformBuildPackageVersion>17.11.0-preview-24320-06</MicrosoftTestPlatformBuildPackageVersion>
174+
<MicrosoftNETTestSdkPackageVersion>17.12.0-preview-24353-03</MicrosoftNETTestSdkPackageVersion>
175+
<MicrosoftTestPlatformCLIPackageVersion>17.12.0-preview-24353-03</MicrosoftTestPlatformCLIPackageVersion>
176+
<MicrosoftTestPlatformBuildPackageVersion>17.12.0-preview-24353-03</MicrosoftTestPlatformBuildPackageVersion>
177177
</PropertyGroup>
178178
<PropertyGroup>
179179
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -201,19 +201,19 @@
201201
then use that in Directory.Packages.props.
202202
203203
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
204-
<MicrosoftBuildVersion>17.12.0-preview-24352-02</MicrosoftBuildVersion>
205-
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24352-02</MicrosoftBuildLocalizationVersion>
204+
<MicrosoftBuildVersion>17.12.0-preview-24354-03</MicrosoftBuildVersion>
205+
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24354-03</MicrosoftBuildLocalizationVersion>
206206
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
207207
</PropertyGroup>
208208
<PropertyGroup>
209209
<!-- Dependencies from https://github.com/dotnet/templating -->
210-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.7.24352.16</MicrosoftTemplateEngineAbstractionsPackageVersion>
210+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.7.24354.2</MicrosoftTemplateEngineAbstractionsPackageVersion>
211211
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
212212
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
213213
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
214214
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
215215
<!-- test dependencies -->
216-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.7.24352.16</MicrosoftTemplateEngineMocksPackageVersion>
216+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.7.24354.2</MicrosoftTemplateEngineMocksPackageVersion>
217217
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
218218
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
219219
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -224,41 +224,41 @@
224224
</PropertyGroup>
225225
<PropertyGroup>
226226
<!-- Dependencies from https://github.com/dotnet/roslyn -->
227-
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24352.9</MicrosoftNetCompilersToolsetVersion>
228-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24352.9</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
229-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24352.9</MicrosoftCodeAnalysisPackageVersion>
230-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24352.9</MicrosoftCodeAnalysisCSharpPackageVersion>
231-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24352.9</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
232-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24352.9</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
233-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24352.9</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
234-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24352.9</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
227+
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24355.3</MicrosoftNetCompilersToolsetVersion>
228+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24355.3</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
229+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24355.3</MicrosoftCodeAnalysisPackageVersion>
230+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24355.3</MicrosoftCodeAnalysisCSharpPackageVersion>
231+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24355.3</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
232+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24355.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
233+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24355.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
234+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24355.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
235235
</PropertyGroup>
236236
<PropertyGroup>
237237
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
238-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24329.2</MicrosoftAspNetCoreAppRefPackageVersion>
239-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24329.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
240-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24329.2</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
241-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24329.2</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
242-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24329.2</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
243-
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24329.2</MicrosoftAspNetCoreAnalyzersPackageVersion>
244-
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24329.2</MicrosoftAspNetCoreTestHostPackageVersion>
245-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24329.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
246-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24329.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
247-
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24329.2</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
248-
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24329.2</dotnetdevcertsPackageVersion>
249-
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24329.2</dotnetuserjwtsPackageVersion>
250-
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24329.2</dotnetusersecretsPackageVersion>
238+
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreAppRefPackageVersion>
239+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
240+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
241+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
242+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
243+
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreAnalyzersPackageVersion>
244+
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreTestHostPackageVersion>
245+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
246+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
247+
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24355.2</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
248+
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24355.2</dotnetdevcertsPackageVersion>
249+
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24355.2</dotnetuserjwtsPackageVersion>
250+
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24355.2</dotnetusersecretsPackageVersion>
251251
</PropertyGroup>
252252
<PropertyGroup>
253253
<!-- Dependencies from https://github.com/dotnet/razor -->
254-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24352.8</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
255-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24352.8</MicrosoftCodeAnalysisRazorToolingInternalVersion>
256-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24352.8</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
254+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24357.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
255+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24357.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
256+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24357.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
257257
</PropertyGroup>
258258
<PropertyGroup>
259259
<!-- Dependencies from https://github.com/dotnet/wpf -->
260-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24352.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
261-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24352.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
260+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24355.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
261+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24355.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
262262
</PropertyGroup>
263263
<PropertyGroup Label="Runtime and Apphost aliases">
264264
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
@@ -302,10 +302,10 @@
302302
</PropertyGroup>
303303
<PropertyGroup>
304304
<!-- Dependencies from https://github.com/dotnet/arcade -->
305-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24351.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
306-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24351.5</MicrosoftDotNetSignToolVersion>
307-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24351.5</MicrosoftDotNetXliffTasksVersion>
308-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24351.5</MicrosoftDotNetXUnitExtensionsVersion>
305+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24352.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
306+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24352.2</MicrosoftDotNetSignToolVersion>
307+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24352.2</MicrosoftDotNetXliffTasksVersion>
308+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24352.2</MicrosoftDotNetXUnitExtensionsVersion>
309309
</PropertyGroup>
310310
<PropertyGroup>
311311
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎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.24351.5",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24351.5",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24352.2",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24352.2",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<TieredCompilationQuickJitForLoops>true</TieredCompilationQuickJitForLoops>
4040
<TieredPGO>true</TieredPGO>
4141
<StartupHookSupport>false</StartupHookSupport>
42+
<StackTraceSupport>false</StackTraceSupport>
4243
<EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
4344
<AutoreleasePoolSupport>false</AutoreleasePoolSupport>
4445
<ThreadPoolMinThreads>2</ThreadPoolMinThreads>

‎src/SourceBuild/content/eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24311.1">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24352.2">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319</Sha>
7+
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

‎src/SourceBuild/content/eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
2424
are not necessary, and this property is removed from the file.
2525
-->
26-
<PrivateSourceBuiltSdkVersion>9.0.100-preview.6.24312.1</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.6.24312.1</PrivateSourceBuiltArtifactsVersion>
26+
<PrivateSourceBuiltSdkVersion>9.0.100-preview.7.24357.1</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.7.24357.1</PrivateSourceBuiltArtifactsVersion>
2828
<!-- command-line-api dependencies -->
2929
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3030
<!-- msbuild dependencies -->

‎src/SourceBuild/content/global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.6.24311.23"
3+
"dotnet": "9.0.100-preview.7.24357.2"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.1"
8+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24352.2"
99
}
1010
}

‎src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,6 @@ src/runtime/src/libraries/System.ServiceModel.Syndication/tests/TestFeeds/AtomFe
167167
src/runtime/src/libraries/System.Text.Json/roadmap/images/core-components.txt|unknown-license-reference
168168
src/runtime/src/libraries/System.Text.Json/roadmap/images/higher-level-components.txt
169169

170-
# Sample data
171-
src/runtime/src/mono/sample/wasm/browser-webpack/package-lock.json
172-
173170
#
174171
# sdk
175172
#

0 commit comments

Comments
 (0)