Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit eff71e6

Browse files
committed
Use live core-setup dependency for codeflow from framework
1 parent d0c5899 commit eff71e6

File tree

6 files changed

+28
-4
lines changed

6 files changed

+28
-4
lines changed

Directory.Build.targets

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,12 @@
55
<Target Name="SetTelemetryProfile">
66
<SetEnvVar Name="DOTNET_CLI_TELEMETRY_PROFILE" Value="$(DOTNET_CLI_TELEMETRY_PROFILE);https://github.com/dotnet/cli;$(BuildNumber)" />
77
</Target>
8+
9+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
10+
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))">
11+
<FrameworkReference
12+
Update="Microsoft.NETCore.App"
13+
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
14+
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefPackageVersion)" />
15+
</ItemGroup>
816
</Project>

eng/Version.Details.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-preview7-27826-20">
5+
<Uri>https://github.com/dotnet/core-setup</Uri>
6+
<Sha>ee0c7ead1a46f06f98aff9102b785f532b71da9c</Sha>
7+
</Dependency>
48
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="1.0.2-beta5.19320.1">
59
<Uri>https://github.com/dotnet/templating</Uri>
610
<Sha>cd8a65408312bf4a92de7e97948782f9f88471e6</Sha>

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
</PropertyGroup>
1313
<!-- Production Dependencies -->
1414
<PropertyGroup>
15+
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-preview7-27826-20</MicrosoftNETCoreAppRefPackageVersion>
1516
<DotNetCoreSdkLKGVersion>3.0.100-preview7-012358</DotNetCoreSdkLKGVersion>
1617
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview7.19325.7</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
1718
<MicrosoftNETCoreDotNetHostResolverPackageVersion>2.2.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>

eng/restore-toolset.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ function InitializeCustomSDKToolset {
2828
}
2929

3030
$cli = InitializeDotnetCli -install:$true
31-
InstallDotNetSharedFramework "1.1.2"
32-
InstallDotNetSharedFramework "2.0.0"
33-
InstallDotNetSharedFramework "2.2.0"
3431

3532
CreateBuildEnvScript
3633
CreateTestEnvScript

global.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
{
22
"tools": {
3-
"dotnet": "3.0.100-preview7-012358"
3+
"dotnet": "3.0.100-preview7-012358",
4+
"runtimes": {
5+
"dotnet": [
6+
"1.1.2",
7+
"2.0.0",
8+
"2.2.0",
9+
"$(MicrosoftNETCoreAppRefPackageVersion)"
10+
]
11+
}
412
},
513
"msbuild-sdks": {
614
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19323.4"

src/redist/redist.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
DestinationFiles="@(SdksContent -> '$(PublishDir)Sdks/%(RecursiveDir)%(Filename)%(Extension)')" />
7676
</Target>
7777

78+
<Target Name="CopyRuntimeConfiguration"
79+
AfterTargets="Publish">
80+
<Copy SourceFiles="$(ProjectRuntimeConfigFilePath)"
81+
DestinationFiles="$(PublishDir)dotnet.runtimeconfig.json" />
82+
</Target>
83+
7884
<Target Name="ChmodPublishDir"
7985
AfterTargets="PublishMSBuildExtensions"
8086
Condition=" '$(OS)' != 'Windows_NT' ">

0 commit comments

Comments
 (0)