Skip to content

Upgrade global.json to 5.0-alpha1 SDK#445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViktorHofer merged 10 commits into from
Dec 5, 2019
Merged

Upgrade global.json to 5.0-alpha1 SDK #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8ef6001
Upgrade global.json to 5.0-alpha1 SDK
ViktorHofer Dec 2, 2019
a1aef8e
Introduce a vNext NetCoreApp TFM
ViktorHofer Dec 2, 2019
8656983
Update tfm props names
ViktorHofer Dec 2, 2019
15343f6
React to naming suggestion
ViktorHofer Dec 4, 2019
70636c9
Don't apply RuntimeFramework for depprojs
ViktorHofer Dec 5, 2019
ea85fd3
Binplace framework refs for netcoreapp
ViktorHofer Dec 5, 2019
81d8b94
Update pkg testing for netcoreapp5.0 sdk
ViktorHofer Dec 5, 2019
8678bcd
Bring CoreLib ignoreref for netcoreapp3.0 back
ViktorHofer Dec 5, 2019
0b0d86a
Update another coreclr test dependency
ViktorHofer Dec 5, 2019
4e4ada0
Downgrade the required sdk version
ViktorHofer Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
-->
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(SkipImportArcadeSdkFromRoot)' != 'true'" />

<!-- Common paths -->

<!-- Set these properties early enough for libraries as they import the Arcade SDK not early enough. -->
<PropertyGroup Condition="'$(SkipImportArcadeSdkFromRoot)' == 'true'">
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
Expand All@@ -28,6 +26,12 @@
<ArtifactsBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin'))</ArtifactsBinDir>
</PropertyGroup>

<!-- The NetCoreApp TFM to build and test against. -->
<PropertyGroup>
<NetCoreAppCurrentTargetFrameworkMoniker>.NETCoreApp,Version=v5.0</NetCoreAppCurrentTargetFrameworkMoniker>
<NetCoreAppCurrent>netcoreapp5.0</NetCoreAppCurrent>
</PropertyGroup>

<!--
Get ProjectToBuild and '<subset>ProjectToBuild' items. Using the items lets projects handle
$(Subset) automatically when creating project-to-project dependencies.
Expand Down
4 changes: 2 additions & 2 deletions eng/configurations/targetgroups.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,8 +100,8 @@
</TargetGroups>
<!-- netcoreapp is an alias for netcoreapp5.0 -->
<TargetGroups Include="netcoreapp">
<TargetFramework>netcoreapp5.0</TargetFramework>
<Imports>netcoreapp5.0</Imports>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<Imports>$(NetCoreAppCurrent)</Imports>
<CompatibleWith>netstandard2.1</CompatibleWith>
</TargetGroups>
<TargetGroups Include="net45">
Expand Down
2 changes: 1 addition & 1 deletion eng/testing/runtimeConfiguration.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
At that point restore and conflict resolution already happened therefore setting the item here has no side effects.
-->
<Target Name="_SetRuntimeFrameworksForTestAssemblies"
Condition="'$(SelfContained)' != 'true'"
Condition="'$(SelfContained)' != 'true' and '$(MSBuildProjectExtension)' != '.depproj'"

@ericstjericstjDec 5, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/cc @Anipik

BeforeTargets="GenerateBuildDependencyFile">
<ItemGroup>
<RuntimeFramework Include="Microsoft.NETCore.App" Version="$(ProductVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
"rollForward": "major"
},
"tools": {
"dotnet": "3.0.100"
"dotnet": "5.0.100-alpha1-015772"
},
"native-tools": {
"cmake": "3.14.2",
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,10 @@
<Crossgen2RuntimeConfigContents>
{
"runtimeOptions": {
"tfm": "netcoreapp3.0",
"tfm": "netcoreapp5.0",
"framework": {
"name": "Microsoft.NETCore.App",
"version": "5.0.0-alpha1.0"
"version": "5.0.100-alpha1-015772"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/.nuget/optdata/optdata.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<OptimizationDataSupported Condition="'$(BuildOS)' == 'Windows_NT' And ('$(BuildArch)' == 'x64' Or '$(BuildArch)' == 'x86')">True</OptimizationDataSupported>
<OptimizationDataSupported Condition="'$(BuildOS)' == 'Linux' And '$(BuildArch)' == 'x64'">True</OptimizationDataSupported>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileNugetCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ public static int CompileNuget(BuildOptions options)
}

// This is not a reliable way of building the publish folder
string publishFolder = Path.Combine(appFolder, @"artifacts\Debug\netcoreapp3.0\publish");
string publishFolder = Path.Combine(appFolder, @"artifacts\Debug\netcoreapp5.0\publish");
if (!Directory.Exists(publishFolder))
{
nugetLog.WriteLine($"Could not find folder {publishFolder} containing the published app.");
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<AssemblyName>ReadyToRun.SuperIlc</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<NoWarn>8002,NU1701</NoWarn>
<Platform>AnyCPU</Platform>
<OutputPath>$(BinDir)\ReadyToRun.SuperIlc</OutputPath>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>ILCompiler.ReadyToRun</AssemblyName>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>READYTORUN;$(DefineConstants)</DefineConstants>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<AssemblyName>crossgen2</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<NoWarn>8002,NU1701</NoWarn>
<Platforms>x64;x86</Platforms>
<PlatformTargets Condition="'$(BuildArch)' != ''">$(BuildArch)</PlatformTargets>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/tools/r2rdump/R2RDump.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<AssemblyKey>Open</AssemblyKey>
<IsDotNetFrameworkProductAssembly>true</IsDotNetFrameworkProductAssembly>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<CLSCompliant>false</CLSCompliant>
<NoWarn>8002,NU1701</NoWarn>
<RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/tools/runincontext/runincontext.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<RuntimeFrameworkVersion>$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
<UseAppHost>false</UseAppHost>
<CLRTestKind>BuildOnly</CLRTestKind>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tests/dir.sdkbuild.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
and old-style projects should go in dir.common.props. -->

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<EnableDefaultItems>false</EnableDefaultItems>
<Platform>$(BuildArch)</Platform>
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/tests/external/external.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,9 @@
This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here
-->
<OutputPath>$(TargetingPackPath)</OutputPath>
<TargetFramework>netcoreapp3.0</TargetFramework>
<NuGetTargetMoniker>.NETCoreApp,Version=v3.0</NuGetTargetMoniker>
<NuGetTargetMonikerShort>netcoreapp3.0</NuGetTargetMonikerShort>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<NuGetTargetMoniker>$(NetCoreAppCurrentTargetFrameworkMoniker)</NuGetTargetMoniker>
<NuGetTargetMonikerShort>$(NetCoreAppCurrent)</NuGetTargetMonikerShort>
<RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
<XUnitRunnerTargetFramework>netcoreapp2.1</XUnitRunnerTargetFramework>
<CLRTestKind>SharedLibrary</CLRTestKind>
Expand Down
9 changes: 3 additions & 6 deletions src/coreclr/tests/publishdependency.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Project>
<ItemGroup>
<TestTargetFramework Include=".NETCoreApp,Version=v5.0">
<Folder>netcoreapp5.0</Folder>
<TestTargetFramework Include="$(NetCoreAppCurrentTargetFrameworkMoniker)">
<Folder>$(NetCoreAppCurrent)</Folder>
</TestTargetFramework>
</ItemGroup>

Expand DownExpand Up@@ -34,5 +32,4 @@
Properties="Language=C#;RuntimeIdentifier=$(TargetRid)" />

</Target>

</Project>
6 changes: 1 addition & 5 deletions src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,7 @@
<DefineConstants>$(DefineConstants);$([System.String]::Copy('$(BuildArch)').ToUpper())</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateRunScript>false</GenerateRunScript>
<!-- Tests build for netcoreapp3.0, but use the test_dependencies
assets file, which has netcoreapp5.0 assets. Therefore the
assets file for this project must have netcoreapp5.0 assets,
but the project needs to build for 3.0. -->
<TargetFramework Condition=" '$(SetTFMForRestore)' == 'true' ">netcoreapp5.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<ProjectAssetsFile>$(SourceDir)Common\CoreCLRTestLibrary\obj\project.assets.json</ProjectAssetsFile>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ProjectAssetsFile>$(SourceDir)Common\Coreclr.TestWrapper\obj\project.assets.json</ProjectAssetsFile>
<NuGetTargetMoniker>.NETCoreApp,Version=v3.0</NuGetTargetMoniker>
<NuGetTargetMonikerShort>netcoreapp3.0</NuGetTargetMonikerShort>
<NuGetTargetMoniker>$(NetCoreAppCurrentTargetFrameworkMoniker)</NuGetTargetMoniker>
<NuGetTargetMonikerShort>$(NetCoreAppCurrent)</NuGetTargetMonikerShort>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@
<PropertyGroup>
<CLRTestKind>BuildOnly</CLRTestKind>
<IsTestProject>false</IsTestProject>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(SetTFMForRestore)'=='true'">netcoreapp5.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<DisableRarCache>true</DisableRarCache>
<DisablePackageAssetsCache>true</DisablePackageAssetsCache>
<RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
Expand Down
3 changes: 1 addition & 2 deletions src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@
<PropertyGroup>
<CLRTestKind>BuildOnly</CLRTestKind>
<IsTestProject>false</IsTestProject>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(SetTFMForRestore)'=='true'">netcoreapp5.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
<AssetTargetFallback>$(AssetTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</AssetTargetFallback>
<NoWarn>$(NoWarn);NU1603</NoWarn>
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/tests/src/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,7 +142,7 @@
<RestoreOutputPath>$(MSBuildProjectDirectory)\obj</RestoreOutputPath>

<!-- Specify the target framework of the common test dependency project.json. -->
<NuGetTargetMoniker>.NETCoreApp,Version=v5.0</NuGetTargetMoniker>
<NuGetTargetMonikerShort>netcoreapp5.0</NuGetTargetMonikerShort>
<NuGetTargetMoniker>$(NetCoreAppCurrentTargetFrameworkMoniker)</NuGetTargetMoniker>
<NuGetTargetMonikerShort>$(NetCoreAppCurrent)</NuGetTargetMonikerShort>
</PropertyGroup>
</Project>
6 changes: 5 additions & 1 deletion src/coreclr/tests/src/performance/Scenario/JitBench/Utilities/DotNetSetup.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,11 @@ public static string GetSDKDownloadLink(string azureFeed, string version, string

public static string GetTargetFrameworkMonikerForFrameworkVersion(string runtimeVersion)
{
if (runtimeVersion.StartsWith("3.0"))
if (runtimeVersion.StartsWith("5.0"))
{
return "netcoreapp5.0";
}
else if (runtimeVersion.StartsWith("3.0"))
{
return "netcoreapp3.0";
}
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@
deb-tool" commands, after depending on InitializeDotnetDebTool target.
-->
<DebToolBinDir>$(ArtifactsBinDir)dotnet-deb-tool\</DebToolBinDir>
<DebtoolAssemblyFile>$(DebToolBinDir)$(Configuration)\netcoreapp3.0\dotnet-deb-tool.dll</DebtoolAssemblyFile>
<DebtoolAssemblyFile>$(DebToolBinDir)$(Configuration)\$(NetCoreAppCurrent)\dotnet-deb-tool.dll</DebtoolAssemblyFile>
<DotnetDebToolSourceDir>$(RepoRoot)tools-local/dotnet-deb-tool/</DotnetDebToolSourceDir>

<IsDebianBasedDistro
Expand Down
2 changes: 1 addition & 1 deletion src/installer/test/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
<TestRestoreNuGetConfigFile>$(ArtifactsObjDir)TestNuGetConfig\NuGet.config</TestRestoreNuGetConfigFile>
<InternalNupkgCacheDir>$(ArtifactsObjDir)ExtraNupkgsForTestRestore\</InternalNupkgCacheDir>
<TestArchitectures>$(TargetArchitecture)</TestArchitectures>
<TestInfraTargetFramework>netcoreapp3.0</TestInfraTargetFramework>
<TestInfraTargetFramework>$(NetCoreAppCurrent)</TestInfraTargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,6 @@
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<PackageConflictPreferredPackages Condition="'$(TargetFramework)' != 'netcoreapp2.0'">Microsoft.Private.CoreFx.NETCoreApp;runtime.$(RuntimeIdentifiers).Microsoft.Private.CoreFx.NETCoreApp;$(PackageConflictPreferredPackages)</PackageConflictPreferredPackages>
<DisableImplicitFrameworkReferences Condition="$(TargetFramework.Contains('netcoreapp'))">true</DisableImplicitFrameworkReferences>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
</PropertyGroup>
</Project>
31 changes: 2 additions & 29 deletions src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,8 @@
<Project>
<PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework>
<NETCoreAppMaximumVersion>5.0</NETCoreAppMaximumVersion>
<RuntimeFrameworkVersion>$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
<!-- This should be enabled once we have updating assembly versions in our targeting pack. -->
<ShouldVerifyClosure>false</ShouldVerifyClosure>
</PropertyGroup>

<ItemGroup>
<!-- Since we don't have an SDK that knows about 5.0 framework, we should specify it manually. -->
<KnownFrameworkReference Update="Microsoft.NETCore.App"
TargetFramework="$(TargetFramework)"
RuntimeFrameworkName="Microsoft.NETCore.App"
DefaultRuntimeFrameworkVersion="$(RuntimeFrameworkVersion)"
LatestRuntimeFrameworkVersion="$(RuntimeFrameworkVersion)"
TargetingPackName="Microsoft.NETCore.App.Ref"
TargetingPackVersion="$(RuntimeFrameworkVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86"
PackagesToReference="Microsoft.NETCore.App/$(RuntimeFrameworkVersion)"
IsTrimmable="true"
/>

<KnownAppHostPack Update="Microsoft.NETCore.App"
TargetFramework="$(TargetFramework)"
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
AppHostPackVersion="$(RuntimeFrameworkVersion)"
AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86"
/>

<KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
<KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App" />
<KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WPF" />
<KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WindowsForms" />
</ItemGroup>
</Project>
11 changes: 11 additions & 0 deletions src/libraries/restore/netcoreapp/netcoreapp.depproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,17 @@
<PackageReference Update="Microsoft.NETCore.App" IsImplicitlyDefined="false" PrivateAssets="None" />
</ItemGroup>

<!-- Mark framework references from previous netcoreapp tfms >= 3.0 as copy-local. -->
<Target Name="_FrameworkReferencesToPrivate"

@ericstjericstjDec 5, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead I’d just do this for all items in depproj targets.

@ViktorHoferViktorHoferDec 5, 2019

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you elaborate? Not sure I follow. Do you mean to actually Define an ItemDefintionGroup for reference?

@ViktorHoferViktorHoferDec 5, 2019

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you mean you would do it for all targets, I would rather not as we include netstandard2.0 here as well which just creates noise in the ref folder, ie dotnet-XmlGenerator.

@ericstjericstjDec 5, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant that the purpose of DepProj is to copy. It flows these items to content here:

runtime/eng/depProj.targets

Line 95 in 8f67999

<ContentWithTargetPathInclude="@(NuGetDeploy)">

This is effectively doing the same thing you're trying to do (force to copy). If that wasn't working for framework references we should fix it there.

@ViktorHoferViktorHoferDec 5, 2019

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I investigated why this wasn't working with the depproj/binplacing logic. I will submit a follow-up PR when I have some cycles to fix it there.

Condition="'$(TargetsNetCoreApp)' == 'true' and !$(TargetFramework.StartsWith('netcoreapp2.')) and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"
AfterTargets="_HandlePackageFileConflicts">
<ItemGroup>
<_referencePrivate Include="@(Reference)" Private="true" />
<Reference Remove="@(Reference)" />
<Reference Include="@(_referencePrivate)" />
</ItemGroup>
</Target>

<ItemGroup>
<!-- for all configurations this project provides refs for that configuration -->
<BinPlaceConfiguration Include="$(Configuration)" RefPath="$(RefPath)" />
Expand Down
2 changes: 1 addition & 1 deletion tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<AssemblyName>dotnet-deb-tool</AssemblyName>
<OutputType>Exe</OutputType>
</PropertyGroup>
Expand Down