Skip to content

Commit ec8c882

Browse files
dotnet-sb-botdotnet-sb-bot
authored
Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.24556.1 (#44685)
1 parent 8a2a9d0 commit ec8c882

10 files changed

+204
-25
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,9 @@
254254
<Uri>https://github.com/dotnet/runtime</Uri>
255255
<Sha>9c1f53e39f48b09be71097f1b7a47e45331e4906</Sha>
256256
</Dependency>
257-
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
258-
See https://github.com/dotnet/sdk/issues/42920. -->
259-
<Dependency Name="System.Resources.Extensions" Version="9.0.0-rc.2.24473.5" Pinned="True">
257+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-alpha.1.24557.1">
260258
<Uri>https://github.com/dotnet/runtime</Uri>
261-
<Sha>c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1</Sha>
259+
<Sha>5b56f15ef5ac5ded75b342d31759d22d2202764d</Sha>
262260
</Dependency>
263261
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.24556.1">
264262
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -585,15 +583,13 @@
585583
<Uri>https://github.com/dotnet/runtime</Uri>
586584
<Sha>9c1f53e39f48b09be71097f1b7a47e45331e4906</Sha>
587585
</Dependency>
588-
<Dependency Name="System.Security.Permissions" Version="9.0.0-rc.2.24473.5" Pinned="True">
586+
<Dependency Name="System.Security.Permissions" Version="10.0.0-alpha.1.24557.1">
589587
<Uri>https://github.com/dotnet/runtime</Uri>
590-
<Sha>c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1</Sha>
588+
<Sha>5b56f15ef5ac5ded75b342d31759d22d2202764d</Sha>
591589
</Dependency>
592-
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
593-
See https://github.com/dotnet/sdk/issues/42920. -->
594-
<Dependency Name="System.Windows.Extensions" Version="9.0.0-rc.2.24473.5" Pinned="True">
590+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-alpha.1.24557.1">
595591
<Uri>https://github.com/dotnet/runtime</Uri>
596-
<Sha>c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1</Sha>
592+
<Sha>5b56f15ef5ac5ded75b342d31759d22d2202764d</Sha>
597593
</Dependency>
598594
</ProductDependencies>
599595
<ToolsetDependencies>
@@ -627,11 +623,9 @@
627623
<Sha>78eb939933628c20c88ddd88536a70f02ecc2945</Sha>
628624
<SourceBuild RepoName="arcade" ManagedOnly="true" />
629625
</Dependency>
630-
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
631-
See https://github.com/dotnet/sdk/issues/42920. -->
632-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-rc.2.24473.5" Pinned="True">
626+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.24557.1">
633627
<Uri>https://github.com/dotnet/runtime</Uri>
634-
<Sha>c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1</Sha>
628+
<Sha>5b56f15ef5ac5ded75b342d31759d22d2202764d</Sha>
635629
</Dependency>
636630
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24554.3">
637631
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,15 @@
134134
<SystemCompositionRuntimePackageVersion>10.0.0-alpha.1.24557.1</SystemCompositionRuntimePackageVersion>
135135
<SystemCompositionTypedPartsPackageVersion>10.0.0-alpha.1.24557.1</SystemCompositionTypedPartsPackageVersion>
136136
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-alpha.1.24557.1</SystemConfigurationConfigurationManagerPackageVersion>
137-
<SystemReflectionMetadataLoadContextVersion>9.0.0-rc.2.24473.5</SystemReflectionMetadataLoadContextVersion>
138-
<SystemResourcesExtensionsPackageVersion>9.0.0-rc.2.24473.5</SystemResourcesExtensionsPackageVersion>
137+
<SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.24557.1</SystemReflectionMetadataLoadContextVersion>
138+
<SystemResourcesExtensionsPackageVersion>10.0.0-alpha.1.24557.1</SystemResourcesExtensionsPackageVersion>
139139
<SystemSecurityCryptographyPkcsPackageVersion>10.0.0-alpha.1.24557.1</SystemSecurityCryptographyPkcsPackageVersion>
140140
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-alpha.1.24557.1</SystemSecurityCryptographyProtectedDataPackageVersion>
141141
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24557.1</SystemSecurityCryptographyXmlPackageVersion>
142-
<SystemSecurityPermissionsPackageVersion>9.0.0-rc.2.24473.5</SystemSecurityPermissionsPackageVersion>
142+
<SystemSecurityPermissionsPackageVersion>10.0.0-alpha.1.24557.1</SystemSecurityPermissionsPackageVersion>
143143
<SystemTextEncodingCodePagesPackageVersion>10.0.0-alpha.1.24557.1</SystemTextEncodingCodePagesPackageVersion>
144144
<SystemTextJsonPackageVersion>10.0.0-alpha.1.24557.1</SystemTextJsonPackageVersion>
145-
<SystemWindowsExtensionsPackageVersion>9.0.0-rc.2.24473.5</SystemWindowsExtensionsPackageVersion>
145+
<SystemWindowsExtensionsPackageVersion>10.0.0-alpha.1.24557.1</SystemWindowsExtensionsPackageVersion>
146146
<SystemIOHashingPackageVersion>10.0.0-alpha.1.24557.1</SystemIOHashingPackageVersion>
147147
<SystemFormatsAsn1Version>10.0.0-alpha.1.24557.1</SystemFormatsAsn1Version>
148148
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,

‎src/SourceBuild/content/Directory.Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@
117117
<Import Project="$(RepositoryEngineeringDir)Versions.props" Condition="'$(SkipArcadeSdkImport)' == 'true'" />
118118

119119
<PropertyGroup>
120+
<!-- TODO: Remove when Arcade updated NetCurrent to net10.0. -->
121+
<NetCurrent>net10.0</NetCurrent>
120122
<!-- We have no projects targeting multiple frameworks, so don't include in output path. -->
121123
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
122124
<!-- This repo's projects are entirely infrastructure and do not ship. -->

‎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="10.0.0-beta.24522.1">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24551.1">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
7+
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
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-rc.2.24474.1</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>9.0.100-rc.2.24474.1</PrivateSourceBuiltArtifactsVersion>
28-
<PrivateSourceBuiltPrebuiltsVersion>0.1.0-10.0.100-4</PrivateSourceBuiltPrebuiltsVersion>
26+
<PrivateSourceBuiltSdkVersion>10.0.100-alpha.1.24556.1</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>10.0.100-alpha.1.24556.1</PrivateSourceBuiltArtifactsVersion>
28+
<PrivateSourceBuiltPrebuiltsVersion>0.1.0-10.0.100-5</PrivateSourceBuiltPrebuiltsVersion>
2929
<!-- command-line-api dependencies -->
3030
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3131
<!-- 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": "10.0.100-alpha.1.24551.9"
3+
"dotnet": "10.0.100-alpha.1.24555.54"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24522.1"
8+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1"
99
}
1010
}

‎src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
From b6100609c16295746b0c875494d5d66dabe35560 Mon Sep 17 00:00:00 2001
2+
From: Viktor Hofer <[email protected]>
3+
Date: Wed, 6 Nov 2024 16:43:26 +0000
4+
Subject: [PATCH] Update to .NET 10 SDK and TFM to net10.0 in arcade
5+
6+
Backport: https://github.com/dotnet/arcade/pull/15221
7+
---
8+
Directory.Build.props | 5 +++++
9+
global.json | 4 ++--
10+
.../src/build/Packaging.targets | 4 ++++
11+
.../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +-
12+
.../Microsoft.DotNet.XliffTasks.csproj | 4 ----
13+
5 files changed, 12 insertions(+), 7 deletions(-)
14+
15+
diff --git a/Directory.Build.props b/Directory.Build.props
16+
index 9d84f1dc6..b25de0091 100644
17+
--- a/Directory.Build.props
18+
+++ b/Directory.Build.props
19+
@@ -16,6 +16,11 @@
20+
<RepositoryUrl>https://github.com/dotnet/arcade</RepositoryUrl>
21+
<!-- Only upgrade NuGetAudit warnings to errors for official builds. -->
22+
<WarningsNotAsErrors Condition="'$(OfficialBuild)' != 'true'">$(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
23+
+ <!-- TODO: Remove when Arcade SDK updated TargetFrameworkDefaults.props for .NET 10. -->
24+
+ <NetCurrent>net10.0</NetCurrent>
25+
+ <NetPrevious>net9.0</NetPrevious>
26+
+ <NetToolCurrent>$(NetCurrent)</NetToolCurrent>
27+
+ <NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetToolCurrent)</NetToolMinimum>
28+
</PropertyGroup>
29+
30+
</Project>
31+
diff --git a/global.json b/global.json
32+
index 3a7409606..3054e30d7 100644
33+
--- a/global.json
34+
+++ b/global.json
35+
@@ -1,10 +1,10 @@
36+
{
37+
"sdk": {
38+
- "version": "9.0.100-rc.2.24474.11",
39+
+ "version": "10.0.100-alpha.1.24551.9",
40+
"rollForward": "latestFeature"
41+
},
42+
"tools": {
43+
- "dotnet": "9.0.100-rc.2.24474.11"
44+
+ "dotnet": "10.0.100-alpha.1.24551.9"
45+
},
46+
"msbuild-sdks": {
47+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24530.1",
48+
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets
49+
index b94b6736d..e0fadabb2 100644
50+
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets
51+
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets
52+
@@ -954,6 +954,10 @@
53+
<DefaultValidateFramework Include="net9.0">
54+
<RuntimeIDs>@(NETCoreApp90RIDs)</RuntimeIDs>
55+
</DefaultValidateFramework>
56+
+ <NETCoreApp100RIDs Condition="'@(NETCoreApp100RIDs)' == ''" Include="@(NETCoreApp90RIDs)" />
57+
+ <DefaultValidateFramework Include="net10.0">
58+
+ <RuntimeIDs>@(NETCoreApp100RIDs)</RuntimeIDs>
59+
+ </DefaultValidateFramework>
60+
61+
<NETCore50RIDs Condition="'@(NETCore50RIDs)' == ''" Include="win10-x86;win10-x86-aot;win10-x64;win10-x64-aot;win10-arm;win10-arm-aot" />
62+
<DefaultValidateFramework Include="netcore50">
63+
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets
64+
index 0ae8d1482..9312e2672 100644
65+
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets
66+
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets
67+
@@ -2,7 +2,7 @@
68+
<Project>
69+
70+
<PropertyGroup>
71+
- <XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">net9.0</XUnitPublishTargetFramework>
72+
+ <XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">net10.0</XUnitPublishTargetFramework>
73+
<XUnitRuntimeTargetFramework Condition="'$(XUnitRuntimeTargetFramework)' == ''">netcoreapp2.0</XUnitRuntimeTargetFramework>
74+
75+
<XUnitRunnerVersion Condition="'$(XUnitRunnerVersion)' == ''">2.9.2</XUnitRunnerVersion>
76+
diff --git a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj
77+
index 1059c3bc4..165a4a7d5 100644
78+
--- a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj
79+
+++ b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj
80+
@@ -1,10 +1,6 @@
81+
<Project Sdk="Microsoft.NET.Sdk">
82+
83+
<PropertyGroup>
84+
- <!--
85+
- We need to target net8.0 while Arcade SDK 8 is being used.
86+
- Xliff tasks were moved from dotnet/xliff-tasks to Arcade in V9, so they are not available in release/8.0 branch.
87+
- -->
88+
<TargetFrameworks>$(NetToolMinimum);$(NetFrameworkToolCurrent)</TargetFrameworks>
89+
<IsPackable>true</IsPackable>
90+
<IsBuildTaskProject>true</IsBuildTaskProject>

‎src/SourceBuild/patches/aspnetcore/0001-Target net10.0 TFM in RepoTasks.patch‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
From 0612070b83354c70993ca1aa7eabd2babdf8a5c5 Mon Sep 17 00:00:00 2001
2+
From: Matt Thalman <[email protected]>
3+
Date: Wed, 6 Nov 2024 16:08:49 -0600
4+
Subject: [PATCH] Target net10.0 TFM in RepoTasks
5+
6+
Backport: https://github.com/dotnet/aspnetcore/issues/58823
7+
---
8+
eng/tools/RepoTasks/RepoTasks.csproj | 4 ++--
9+
eng/tools/RepoTasks/RepoTasks.tasks | 2 +-
10+
2 files changed, 3 insertions(+), 3 deletions(-)
11+
12+
diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
13+
index 24f833af9b..c462a7517a 100644
14+
--- a/eng/tools/RepoTasks/RepoTasks.csproj
15+
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
16+
@@ -1,6 +1,6 @@
17+
<Project Sdk="Microsoft.NET.Sdk">
18+
<PropertyGroup>
19+
- <TargetFrameworks>net9.0</TargetFrameworks>
20+
+ <TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
21+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
22+
<DefineConstants Condition="'$(TargetFramework)' == 'net472'">$(DefineConstants);BUILD_MSI_TASKS</DefineConstants>
23+
<Optimize>false</Optimize>
24+
@@ -31,7 +31,7 @@
25+
<Compile Remove="shared\CertificateGeneration\*.cs" />
26+
</ItemGroup>
27+
28+
- <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
29+
+ <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
30+
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
31+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
32+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
33+
diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks
34+
index 0ad5b3ae45..b6cd9a820d 100644
35+
--- a/eng/tools/RepoTasks/RepoTasks.tasks
36+
+++ b/eng/tools/RepoTasks/RepoTasks.tasks
37+
@@ -1,6 +1,6 @@
38+
<Project>
39+
<PropertyGroup>
40+
- <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net9.0</_RepoTaskAssemblyFolder>
41+
+ <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">$(DefaultNetCoreTargetFramework)</_RepoTaskAssemblyFolder>
42+
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472</_RepoTaskAssemblyFolder>
43+
<_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll</_RepoTaskAssembly>
44+
</PropertyGroup>

‎src/SourceBuild/patches/nuget-client/0001-Use net10.0 TMF for source build.patch‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 64331771541cc9c911a5fb1e95eb6983a5b13b94 Mon Sep 17 00:00:00 2001
2+
From: Matt Thalman <[email protected]>
3+
Date: Wed, 6 Nov 2024 15:29:15 -0600
4+
Subject: [PATCH] Use net10.0 TMF for source build
5+
6+
Backport: https://github.com/NuGet/Home/issues/13914
7+
---
8+
build/common.project.props | 4 ++--
9+
1 file changed, 2 insertions(+), 2 deletions(-)
10+
11+
diff --git a/build/common.project.props b/build/common.project.props
12+
index f65578999..7c1f04aa9 100644
13+
--- a/build/common.project.props
14+
+++ b/build/common.project.props
15+
@@ -12,9 +12,9 @@
16+
<NETFXTargetFramework>net472</NETFXTargetFramework>
17+
<NetStandardVersion>netstandard2.0</NetStandardVersion>
18+
<NETCoreTargetFramework>net8.0</NETCoreTargetFramework>
19+
- <NETCoreTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'">net9.0</NETCoreTargetFramework>
20+
+ <NETCoreTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'">net10.0</NETCoreTargetFramework>
21+
<NETCoreLegacyTargetFramework>netcoreapp3.1</NETCoreLegacyTargetFramework>
22+
- <NETCoreLegacyTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'">net9.0</NETCoreLegacyTargetFramework>
23+
+ <NETCoreLegacyTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'">net10.0</NETCoreLegacyTargetFramework>
24+
<NETCoreLegacyTargetFrameworkForSigning>netcoreapp5.0</NETCoreLegacyTargetFrameworkForSigning>
25+
26+
<!-- Target frameworks for class libraries-->

‎src/SourceBuild/patches/runtime/0001-Runtime patch to support net10.0.patch‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
From 9ec08acee2d24f45be29469635db8494c5d4046c Mon Sep 17 00:00:00 2001
2+
From: Matt Thalman <[email protected]>
3+
Date: Thu, 7 Nov 2024 09:00:10 -0600
4+
Subject: [PATCH] Runtime patch to support net10.0
5+
6+
Backport: https://github.com/dotnet/runtime/pull/109619
7+
---
8+
.../src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props b/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props
12+
index f624c914ea8..7db89422f2c 100644
13+
--- a/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props
14+
+++ b/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props
15+
@@ -18,7 +18,7 @@ Copyright (c) .NET Foundation. All rights reserved.
16+
<!-- Older SDKs used this property as a sentinel instead, to control the import of this file
17+
(but not the targets, which were included with the SDK). -->
18+
<UsingILLinkTasksSdk>true</UsingILLinkTasksSdk>
19+
- <ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net9.0\ILLink.Tasks.dll</ILLinkTasksAssembly>
20+
+ <ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net10.0\ILLink.Tasks.dll</ILLinkTasksAssembly>
21+
<ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\ILLink.Tasks.dll</ILLinkTasksAssembly>
22+
23+
<ILLinkAnalyzersPropsPath Condition="'$(ILLinkAnalyzersPropsPath)' == ''">$(MSBuildThisFileDirectory)Microsoft.NET.ILLink.Analyzers.props</ILLinkAnalyzersPropsPath>

0 commit comments

Comments
 (0)