Skip to content

Commit 4037180

Browse files
author
Jason Zhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into merge/release/9.0.2xx-to-main
2 parents aab6e93 + 1df6055 commit 4037180

File tree

90 files changed

+666
-1523
lines changed

Some content is hidden

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

90 files changed

+666
-1523
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.24563.1",
6+
"version": "1.1.0-beta.24577.1",
77
"commands": [
88
"darc"
99
]

‎.devcontainer/vmr/init.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ vmr_branch=$(git -C "$sdk_dir" log --pretty=format:'%D' HEAD^ \
2525
| sed 's@origin/@@' \
2626
| sed 's@,.*@@')
2727

28-
"$workspace_dir/synchronize-vmr.sh" --branch "$vmr_branch" --debug
28+
"$workspace_dir/synchronize-vmr.sh" --branch "$vmr_branch" --ci --debug
2929

3030
cd "$vmr_dir"

‎Directory.Build.targets‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
<!-- Update KnownFrameworkReferences to target the right version of the runtime -->
5353
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
5454
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))
55-
and '$(MSBuildProjectName)' != 'toolset-tasks'
56-
and '$(MSBuildProjectName)' != 'core-sdk-tasks'">
55+
and '$(MSBuildProjectName)' != 'sdk-tasks'">
5756
<FrameworkReference
5857
Update="Microsoft.NETCore.App"
5958
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"

‎Directory.Packages.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
<PackageVersion Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion)" />
6464
<PackageVersion Include="Microsoft.TemplateEngine.TestHelper" Version="$(MicrosoftTemplateEngineTestHelperPackageVersion)" />
6565
<PackageVersion Include="Microsoft.TemplateSearch.Common" Version="$(MicrosoftTemplateSearchCommonPackageVersion)" />
66+
<PackageVersion Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" />
67+
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />
6668
<PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
6769
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
6870
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />

‎documentation/project-docs/developer-guide.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ This should print `Hello World!`.
166166

167167
## Locked files
168168

169-
If you see error like ` error MSB3021: Unable to copy file "toolset-tasks.dll" to "toolset-tasks.dll". The process cannot access the file 'toolset-tasks.dll' because it is being used by another process.`
169+
If you see error like ` error MSB3021: Unable to copy file "sdk-tasks.dll" to "sdk-tasks.dll". The process cannot access the file 'sdk-tasks.dll' because it is being used by another process.`
170170

171171
You could run the following to stop all dotnet related processes
172172

‎eng/Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
1212
'$(OS)' == 'Windows_NT' and
1313
'$(Architecture)' == 'x64'">
14-
<ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\projects\VSMSBuildExtensions\VSMSBuildExtensions.csproj" DotNetBuildPass="2" />
15-
<ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\projects\VSTemplateLocator\VSTemplateLocator.csproj" DotNetBuildPass="2" />
14+
<ProjectToBuild Include="$(RepoRoot)src\VSMSBuildExtensions\VSMSBuildExtensions.proj" DotNetBuildPass="2" />
15+
<ProjectToBuild Include="$(RepoRoot)src\VSTemplateLocator\VSTemplateLocator.proj" DotNetBuildPass="2" />
1616
</ItemGroup>
1717

1818
</Project>

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</UsingToolMicrosoftNetCompilers>
2929
<MicrosoftIORedistPackageVersion>6.0.1</MicrosoftIORedistPackageVersion>
3030
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
31+
<MicrosoftTestingPlatformVersion>1.5.0-preview.24602.2</MicrosoftTestingPlatformVersion>
3132
</PropertyGroup>
3233
<PropertyGroup Label="Servicing version information">
3334
<VersionFeature21>30</VersionFeature21>
@@ -74,7 +75,7 @@
7475
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
7576
<SystemCommandLineVersion>2.0.0-beta4.24528.1</SystemCommandLineVersion>
7677
<SystemCommandLineRenderingVersion>0.4.0-alpha.24528.1</SystemCommandLineRenderingVersion>
77-
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24572.3</MicrosoftDeploymentDotNetReleasesVersion>
78+
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24575.2</MicrosoftDeploymentDotNetReleasesVersion>
7879
<MicrosoftDiaSymReaderVersion>2.2.0-beta.24574.1</MicrosoftDiaSymReaderVersion>
7980
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
8081
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
@@ -90,7 +91,7 @@
9091
</PropertyGroup>
9192
<PropertyGroup>
9293
<!-- Dependency from https://github.com/dotnet/arcade-services -->
93-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24563.1</MicrosoftDotNetDarcLibVersion>
94+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24577.1</MicrosoftDotNetDarcLibVersion>
9495
</PropertyGroup>
9596
<PropertyGroup>
9697
<!-- Dependency from https://github.com/dotnet/winforms -->
@@ -152,24 +153,24 @@
152153
</PropertyGroup>
153154
<PropertyGroup>
154155
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
155-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24575.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
156-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24575.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
157-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24575.1</MicrosoftWindowsDesktopAppRefPackageVersion>
156+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24576.3</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
157+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24576.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
158+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24576.3</MicrosoftWindowsDesktopAppRefPackageVersion>
158159
</PropertyGroup>
159160
<PropertyGroup>
160161
<!-- Dependencies from https://github.com/nuget/nuget.client -->
161-
<NuGetBuildTasksPackageVersion>6.13.0-preview.1.71</NuGetBuildTasksPackageVersion>
162-
<NuGetBuildTasksConsolePackageVersion>6.13.0-preview.1.71</NuGetBuildTasksConsolePackageVersion>
163-
<NuGetLocalizationPackageVersion>6.13.0-preview.1.71</NuGetLocalizationPackageVersion>
164-
<NuGetBuildTasksPackPackageVersion>6.13.0-preview.1.71</NuGetBuildTasksPackPackageVersion>
165-
<NuGetCommandLineXPlatPackageVersion>6.13.0-preview.1.71</NuGetCommandLineXPlatPackageVersion>
166-
<NuGetProjectModelPackageVersion>6.13.0-preview.1.71</NuGetProjectModelPackageVersion>
167-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.0-preview.1.71</MicrosoftBuildNuGetSdkResolverPackageVersion>
168-
<NuGetCommonPackageVersion>6.13.0-preview.1.71</NuGetCommonPackageVersion>
169-
<NuGetConfigurationPackageVersion>6.13.0-preview.1.71</NuGetConfigurationPackageVersion>
170-
<NuGetFrameworksPackageVersion>6.13.0-preview.1.71</NuGetFrameworksPackageVersion>
171-
<NuGetPackagingPackageVersion>6.13.0-preview.1.71</NuGetPackagingPackageVersion>
172-
<NuGetVersioningPackageVersion>6.13.0-preview.1.71</NuGetVersioningPackageVersion>
162+
<NuGetBuildTasksPackageVersion>6.13.0-preview.1.73</NuGetBuildTasksPackageVersion>
163+
<NuGetBuildTasksConsolePackageVersion>6.13.0-preview.1.73</NuGetBuildTasksConsolePackageVersion>
164+
<NuGetLocalizationPackageVersion>6.13.0-preview.1.73</NuGetLocalizationPackageVersion>
165+
<NuGetBuildTasksPackPackageVersion>6.13.0-preview.1.73</NuGetBuildTasksPackPackageVersion>
166+
<NuGetCommandLineXPlatPackageVersion>6.13.0-preview.1.73</NuGetCommandLineXPlatPackageVersion>
167+
<NuGetProjectModelPackageVersion>6.13.0-preview.1.73</NuGetProjectModelPackageVersion>
168+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.0-preview.1.73</MicrosoftBuildNuGetSdkResolverPackageVersion>
169+
<NuGetCommonPackageVersion>6.13.0-preview.1.73</NuGetCommonPackageVersion>
170+
<NuGetConfigurationPackageVersion>6.13.0-preview.1.73</NuGetConfigurationPackageVersion>
171+
<NuGetFrameworksPackageVersion>6.13.0-preview.1.73</NuGetFrameworksPackageVersion>
172+
<NuGetPackagingPackageVersion>6.13.0-preview.1.73</NuGetPackagingPackageVersion>
173+
<NuGetVersioningPackageVersion>6.13.0-preview.1.73</NuGetVersioningPackageVersion>
173174
</PropertyGroup>
174175
<PropertyGroup>
175176
<!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -206,20 +207,20 @@
206207
</PropertyGroup>
207208
<PropertyGroup>
208209
<!-- Dependencies from https://github.com/dotnet/templating -->
209-
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.24574.2</MicrosoftTemplateEngineAbstractionsPackageVersion>
210+
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.24601.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
210211
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
211212
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
212213
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
213214
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
214215
<!-- test dependencies -->
215-
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.24574.2</MicrosoftTemplateEngineMocksPackageVersion>
216+
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.24601.1</MicrosoftTemplateEngineMocksPackageVersion>
216217
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
217218
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
218219
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
219220
</PropertyGroup>
220221
<PropertyGroup>
221222
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
222-
<MicrosoftFSharpCompilerPackageVersion>13.9.200-beta.24561.2</MicrosoftFSharpCompilerPackageVersion>
223+
<MicrosoftFSharpCompilerPackageVersion>13.9.200-beta.24578.1</MicrosoftFSharpCompilerPackageVersion>
223224
</PropertyGroup>
224225
<PropertyGroup>
225226
<!-- Dependencies from https://github.com/dotnet/roslyn -->
@@ -234,30 +235,30 @@
234235
</PropertyGroup>
235236
<PropertyGroup>
236237
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
237-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreAppRefPackageVersion>
238-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
239-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
240-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
241-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
242-
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreAnalyzersPackageVersion>
243-
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreTestHostPackageVersion>
244-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
245-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
246-
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24575.5</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
247-
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24575.5</dotnetdevcertsPackageVersion>
248-
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24575.5</dotnetuserjwtsPackageVersion>
249-
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24575.5</dotnetusersecretsPackageVersion>
238+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreAppRefPackageVersion>
239+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
240+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
241+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
242+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
243+
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
244+
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreTestHostPackageVersion>
245+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
246+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
247+
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24602.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
248+
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24602.1</dotnetdevcertsPackageVersion>
249+
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24602.1</dotnetuserjwtsPackageVersion>
250+
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24602.1</dotnetusersecretsPackageVersion>
250251
</PropertyGroup>
251252
<PropertyGroup>
252253
<!-- Dependencies from https://github.com/dotnet/razor -->
253-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24575.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
254-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24575.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
255-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24575.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
254+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24601.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
255+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24601.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
256+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24601.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
256257
</PropertyGroup>
257258
<PropertyGroup>
258259
<!-- Dependencies from https://github.com/dotnet/wpf -->
259-
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24574.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
260-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24574.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
260+
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24576.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
261+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24576.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
261262
</PropertyGroup>
262263
<PropertyGroup Label="Template versions">
263264
<!-- 10.0 Template versions -->
@@ -268,7 +269,7 @@
268269
<PropertyGroup Label="Infrastructure and test only dependencies">
269270
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
270271
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
271-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>10.0.0-preview.24575.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
272+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>10.0.0-preview.24602.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
272273
</PropertyGroup>
273274
<PropertyGroup Label="Manually updated">
274275
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
@@ -277,19 +278,19 @@
277278
</PropertyGroup>
278279
<PropertyGroup>
279280
<!-- Dependencies from https://github.com/dotnet/arcade -->
280-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24572.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
281-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24572.3</MicrosoftDotNetSignToolVersion>
282-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24572.3</MicrosoftDotNetXliffTasksVersion>
283-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24572.3</MicrosoftDotNetXUnitExtensionsVersion>
281+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24578.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
282+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24578.2</MicrosoftDotNetSignToolVersion>
283+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24578.2</MicrosoftDotNetXliffTasksVersion>
284+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24578.2</MicrosoftDotNetXUnitExtensionsVersion>
284285
</PropertyGroup>
285286
<PropertyGroup>
286287
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
287-
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24574.1</MicrosoftBuildTasksGitVersion>
288-
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkCommonVersion>
289-
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkAzureReposGitVersion>
290-
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkGitHubVersion>
291-
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkGitLabVersion>
292-
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkBitbucketGitVersion>
288+
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24577.2</MicrosoftBuildTasksGitVersion>
289+
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkCommonVersion>
290+
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkAzureReposGitVersion>
291+
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkGitHubVersion>
292+
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkGitLabVersion>
293+
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkBitbucketGitVersion>
293294
</PropertyGroup>
294295
<!-- Get .NET Framework reference assemblies from NuGet packages -->
295296
<PropertyGroup>

‎eng/common/native/install-dependencies.sh‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@ case "$os" in
4444
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
4545
# Skip brew update for now, see https://github.com/actions/setup-python/issues/577
4646
# brew update --preinstall
47-
48-
# Temporarily uninstall [email protected] to work around https://github.com/actions/runner-images/issues/10984
49-
brew uninstall --ignore-dependencies --force [email protected]
50-
5147
brew bundle --no-upgrade --no-lock --file=- <<EOF
5248
brew "cmake"
5349
brew "icu4c"
5450
brew "openssl@3"
55-
brew "pkg-config"
51+
brew "pkgconf"
5652
brew "python3"
5753
brew "pigz"
5854
EOF

0 commit comments

Comments
 (0)