Skip to content

Commit 9f606d6

Browse files
committed
Merge branch 'main' into dotnet-test-integration-3
2 parents d009b24 + 2804eb0 commit 9f606d6

File tree

6 files changed

+243
-372
lines changed

6 files changed

+243
-372
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.25060.1",
6+
"version": "1.1.0-beta.25064.2",
77
"commands": [
88
"darc"
99
]

Directory.Build.targets

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Project>
44
<PropertyGroup>
55
<!--
6-
Disable nullable warnings when targeting anything other than our supported .NET core version(s).
6+
Disable nullable warnings when targeting anything other than our supported .NET core version(s).
77
This condition will be evaluated multiple times in multi-targeted projects hence need to be careful
88
to only set in the inner builds, not the outer build where only $(TargetFrameworks) is defined.
99
We still check $(TargetFrameworks) for empty though, because for single-targeted builds we want to
@@ -67,6 +67,10 @@
6767
Update="Microsoft.NETCore.App"
6868
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
6969
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
70+
<KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler"
71+
ILCompilerPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
72+
<KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2"
73+
Crossgen2PackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
7074
</ItemGroup>
7175

7276
<ItemGroup Condition="$(MicrosoftAspNetCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))">

0 commit comments

Comments
 (0)