Skip to content

Commit bdc0998

Browse files
committed
Flow Microsfot.NETCore.App
Fixes #31300
1 parent fc9a3b9 commit bdc0998

File tree

5 files changed

+35
-1
lines changed

5 files changed

+35
-1
lines changed

Directory.Build.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
33
<Import Project="eng\testing\linker\trimmingTests.targets" Condition="'$(IsPublishedAppTestProject)' == 'true'" />
44

5+
<ItemGroup>
6+
<FrameworkReference Update="Microsoft.NETCore.App"
7+
Condition="'$(TargetFramework)' == 'net8.0'"
8+
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
9+
TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
10+
</ItemGroup>
11+
512
<Target Name="GetCustomAssemblyAttributes"
613
BeforeTargets="GetAssemblyAttributes"
714
Condition=" '$(MSBuildProjectExtension)' == '.csproj' "

eng/Version.Details.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,19 @@
4141
<Uri>https://github.com/dotnet/runtime</Uri>
4242
<Sha>bb38848e9877dc0b43860dc219ebe36fc04a6bb3</Sha>
4343
</Dependency>
44+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23364.11">
45+
<Uri>https://github.com/dotnet/runtime</Uri>
46+
<Sha>bb38848e9877dc0b43860dc219ebe36fc04a6bb3</Sha>
47+
</Dependency>
48+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.7.23364.11">
49+
<Uri>https://github.com/dotnet/runtime</Uri>
50+
<Sha>bb38848e9877dc0b43860dc219ebe36fc04a6bb3</Sha>
51+
</Dependency>
52+
<!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
53+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.0-preview.7.23364.11">
54+
<Uri>https://github.com/dotnet/runtime</Uri>
55+
<Sha>bb38848e9877dc0b43860dc219ebe36fc04a6bb3</Sha>
56+
</Dependency>
4457
</ProductDependencies>
4558
<ToolsetDependencies>
4659
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23364.2">

eng/Versions.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.7.23364.11</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
2727
<MicrosoftExtensionsLoggingVersion>8.0.0-preview.7.23364.11</MicrosoftExtensionsLoggingVersion>
2828
<SystemTextJsonVersion>8.0.0-preview.7.23364.11</SystemTextJsonVersion>
29+
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.7.23364.11</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.7.23364.11</MicrosoftNETCoreAppRuntimewinx64Version>
31+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.7.23364.11</MicrosoftNETCoreBrowserDebugHostTransportVersion>
2932
</PropertyGroup>
3033
<PropertyGroup Label="Dependencies from dotnet/arcade">
3134
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23364.2</MicrosoftDotNetBuildTasksTemplatingVersion>

eng/helix.proj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424
<MSSQL_SA_PASSWORD>Password12!</MSSQL_SA_PASSWORD>
2525
</PropertyGroup>
2626

27+
<ItemGroup>
28+
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
29+
<PackageType>runtime</PackageType>
30+
</AdditionalDotNetPackage>
31+
</ItemGroup>
32+
2733
<ItemGroup>
2834
<XUnitProject Include="$(RepoRoot)/test/**/*.csproj"/>
2935
<XUnitProject Remove="$(RepoRoot)/test/EFCore.Specification.Tests/*.csproj"/>

global.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@
55
"rollForward": "latestMajor"
66
},
77
"tools": {
8-
"dotnet": "8.0.100-preview.7.23354.1"
8+
"dotnet": "8.0.100-preview.7.23354.1",
9+
"runtimes": {
10+
"dotnet": [
11+
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
12+
]
13+
}
914
},
1015
"msbuild-sdks": {
1116
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23364.2",

0 commit comments

Comments
 (0)