Skip to content

Commit c099db1

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
authored and
ViktorHofer
committed
Update dependencies from https://github.com/dotnet/sdk build 20240501.18
Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.5.24230.2 -> To Version 9.0.100-preview.5.24251.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.SourceBuild.Intermediate.aspnetcore,Microsoft.DotNet.Test.ProjectTemplates.9.0,Microsoft.SourceBuild.Intermediate.test-templates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.SourceBuild.Intermediate.vstest,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk,Microsoft.DotNet.Darc,Microsoft.DotNet.DarcLib From Version 9.0.0-preview.5.24229.3 -> To Version 9.0.0-preview.5.24251.1 (parent: Microsoft.NET.Sdk
1 parent d092a8a commit c099db1

File tree

7 files changed

+133
-111
lines changed

7 files changed

+133
-111
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.24229.1",
6+
"version": "1.1.0-beta.24230.2",
77
"commands": [
88
"darc"
99
]

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -43,73 +43,73 @@
4343
</PropertyGroup>
4444
<PropertyGroup>
4545
<!-- Dependency from https://github.com/dotnet/arcade-services -->
46-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24229.1</MicrosoftDotNetDarcLibVersion>
46+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24230.2</MicrosoftDotNetDarcLibVersion>
4747
</PropertyGroup>
4848
<PropertyGroup>
4949
<!-- Dependency from https://github.com/dotnet/winforms -->
50-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.5.24228.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
50+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.5.24230.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
5151
</PropertyGroup>
5252
<PropertyGroup>
5353
<!-- Dependency from https://github.com/dotnet/wpf -->
54-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.5.24229.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
54+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.5.24230.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
5555
</PropertyGroup>
5656
<PropertyGroup>
5757
<!-- Dependency from https://github.com/dotnet/test-templates -->
5858
<!-- Supported versions -->
5959
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
6060
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
6161
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.24202.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
62-
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24229.2</MicrosoftDotNetTestProjectTemplates90PackageVersion>
62+
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24230.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
6363
</PropertyGroup>
6464
<PropertyGroup>
6565
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
6666
<NUnit3DotNetNewTemplatePackageVersion>1.8.1</NUnit3DotNetNewTemplatePackageVersion>
6767
</PropertyGroup>
6868
<PropertyGroup>
6969
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
70-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.5.24225.4</MicrosoftAspNetCoreAppRefPackageVersion>
71-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.5.24225.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
72-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.5.24225.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
73-
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.5.24225.4</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
74-
<dotnetdevcertsPackageVersion>9.0.0-preview.5.24225.4</dotnetdevcertsPackageVersion>
75-
<dotnetuserjwtsPackageVersion>9.0.0-preview.5.24225.4</dotnetuserjwtsPackageVersion>
76-
<dotnetusersecretsPackageVersion>9.0.0-preview.5.24225.4</dotnetusersecretsPackageVersion>
70+
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.5.24251.4</MicrosoftAspNetCoreAppRefPackageVersion>
71+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.5.24251.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
72+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.5.24251.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
73+
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.5.24251.4</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
74+
<dotnetdevcertsPackageVersion>9.0.0-preview.5.24251.4</dotnetdevcertsPackageVersion>
75+
<dotnetuserjwtsPackageVersion>9.0.0-preview.5.24251.4</dotnetuserjwtsPackageVersion>
76+
<dotnetusersecretsPackageVersion>9.0.0-preview.5.24251.4</dotnetusersecretsPackageVersion>
7777
</PropertyGroup>
7878
<PropertyGroup>
7979
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
8080
</PropertyGroup>
8181
<PropertyGroup>
8282
<!-- Dependencies from https://github.com/dotnet/sdk -->
83-
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.5.24230.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
84-
<MicrosoftNETSdkPackageVersion>9.0.100-preview.5.24230.2</MicrosoftNETSdkPackageVersion>
85-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.5.24230.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
83+
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.5.24251.18</MicrosoftDotNetCommonItemTemplatesPackageVersion>
84+
<MicrosoftNETSdkPackageVersion>9.0.100-preview.5.24251.18</MicrosoftNETSdkPackageVersion>
85+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.5.24251.18</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
8686
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
8787
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
8888
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
8989
</PropertyGroup>
9090
<PropertyGroup>
9191
<!-- Dependencies from https://github.com/dotnet/roslyn -->
92-
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-2.24229.6</MicrosoftNetCompilersToolsetPackageVersion>
92+
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-2.24230.7</MicrosoftNetCompilersToolsetPackageVersion>
9393
</PropertyGroup>
9494
<PropertyGroup>
9595
<!-- Dependencies from https://github.com/dotnet/corefx -->
96-
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.4.24225.8</MicrosoftNETCorePlatformsPackageVersion>
96+
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.4.24251.3</MicrosoftNETCorePlatformsPackageVersion>
9797
</PropertyGroup>
9898
<PropertyGroup>
9999
<!-- Dependencies from https://github.com/dotnet/core-setup -->
100-
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24225.8</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
101-
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.4.24225.8</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
102-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24225.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
103-
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.4.24225.8</MicrosoftNETCoreAppHostwinx64PackageVersion>
104-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24225.8</MicrosoftNETCoreAppRefPackageVersion>
100+
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24251.3</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
101+
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.4.24251.3</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
102+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24251.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
103+
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.4.24251.3</MicrosoftNETCoreAppHostwinx64PackageVersion>
104+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24251.3</MicrosoftNETCoreAppRefPackageVersion>
105105
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
106106
</PropertyGroup>
107107
<PropertyGroup>
108108
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
109-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.5.24229.3</MicrosoftWindowsDesktopAppRefPackageVersion>
110-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.5.24229.3</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
111-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.5.24229.3</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
112-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.5.24229.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
109+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.5.24251.1</MicrosoftWindowsDesktopAppRefPackageVersion>
110+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.5.24251.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
111+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.5.24251.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
112+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.5.24251.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
113113
</PropertyGroup>
114114
<PropertyGroup>
115115
<!-- 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. -->
@@ -120,7 +120,7 @@
120120
</PropertyGroup>
121121
<PropertyGroup>
122122
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
123-
<NuGetBuildTasksPackageVersion>6.11.0-preview.1.32</NuGetBuildTasksPackageVersion>
123+
<NuGetBuildTasksPackageVersion>6.11.0-preview.1.35</NuGetBuildTasksPackageVersion>
124124
</PropertyGroup>
125125
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
126126
<PropertyGroup>
@@ -209,7 +209,7 @@
209209
<PropertyGroup>
210210
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
211211
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
212-
<MicrosoftNETTestSdkVersion>17.10.0-release-24203-04</MicrosoftNETTestSdkVersion>
212+
<MicrosoftNETTestSdkVersion>17.11.0-preview-24230-01</MicrosoftNETTestSdkVersion>
213213
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-alpha.1.24058.10</MicrosoftExtensionsLoggingConsoleVersion>
214214
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.24222.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
215215
</PropertyGroup>
@@ -225,7 +225,7 @@
225225
<XamarinMacOSWorkloadManifestVersion>14.2.9088-net9-p1</XamarinMacOSWorkloadManifestVersion>
226226
<XamarinTvOSWorkloadManifestVersion>17.2.9088-net9-p1</XamarinTvOSWorkloadManifestVersion>
227227
<!-- Workloads from dotnet/emsdk -->
228-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.4.24222.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
228+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.5.24223.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
229229
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
230230
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
231231
<EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>

‎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.24223.3">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24229.1">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>91ce5946fec9f81f15f81d20e1aab63527302410</Sha>
7+
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</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.4.24223.1</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.4.24223.1</PrivateSourceBuiltArtifactsVersion>
26+
<PrivateSourceBuiltSdkVersion>9.0.100-preview.5.24251.1</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.5.24251.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.4.24223.7"
3+
"dotnet": "9.0.100-preview.5.24229.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.24223.3"
8+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24229.1"
99
}
1010
}

‎src/SourceBuild/patches/roslyn/0001-ambiguous-call-site.patch‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Viktor Hofer <[email protected]>
3+
Date: Thu, 2 May 2024 17:22:41 +0000
4+
Subject: [PATCH] Avoid ambiguous call site
5+
6+
---
7+
.../Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs
11+
index 3839eb370eb..8d272db6b1b 100644
12+
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs
13+
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs
14+
@@ -71,7 +71,7 @@ internal static class CodeGenerationHelpers
15+
break;
16+
}
17+
18+
- name = string.Join(".", [.. names]);
19+
+ name = string.Join(".", names);
20+
}
21+
else
22+
{

0 commit comments

Comments
 (0)