From 522e9b8f84131846b547981e297290afa22b0c86 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 26 May 2020 09:42:39 +0200
Subject: [PATCH] Change tfm to net5.0

---
 Directory.Build.props                                       | 2 +-
 pkg/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj | 2 +-
 src/windowsdesktop/Directory.Build.props                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index be22bc577..f9e3a9eb3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -64,7 +64,7 @@
     <SharedFrameworkName>Microsoft.WindowsDesktop.App</SharedFrameworkName>
     <NETCoreAppFrameworkIdentifier>.NETCoreApp</NETCoreAppFrameworkIdentifier>
     <NETCoreAppFrameworkMoniker>$(NETCoreAppFrameworkIdentifier),Version=v$(NETCoreAppFrameworkVersion)</NETCoreAppFrameworkMoniker>
-    <NETCoreAppFrameworkBrandName>.NET Core $(NETCoreAppFrameworkVersion)</NETCoreAppFrameworkBrandName>
+    <NETCoreAppFrameworkBrandName>.NET $(NETCoreAppFrameworkVersion)</NETCoreAppFrameworkBrandName>
   </PropertyGroup>
 
   <!-- Platform detection -->
diff --git a/pkg/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj b/pkg/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj
index dcd797f38..c14530c32 100644
--- a/pkg/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj
+++ b/pkg/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj
@@ -7,7 +7,7 @@
 
     <FrameworkListTargetPath>data/</FrameworkListTargetPath>
 
-    <TargetFrameworkName>netcoreapp</TargetFrameworkName>
+    <TargetFrameworkName>net</TargetFrameworkName>
     <TargetFrameworkVersion>5.0</TargetFrameworkVersion>
     <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
 
diff --git a/src/windowsdesktop/Directory.Build.props b/src/windowsdesktop/Directory.Build.props
index 8ce121e2c..339639b37 100644
--- a/src/windowsdesktop/Directory.Build.props
+++ b/src/windowsdesktop/Directory.Build.props
@@ -9,7 +9,7 @@
     <TestRestoreNuGetConfigFile>$(ObjDir)TestNuGetConfig\NuGet.config</TestRestoreNuGetConfigFile>
     <InternalNupkgCacheDir>$(ObjDir)ExtraNupkgsForTestRestore\</InternalNupkgCacheDir>
     <TestArchitectures>$(TargetArchitecture)</TestArchitectures>
-    <TestInfraTargetFramework>netcoreapp5.0</TestInfraTargetFramework>
+    <TestInfraTargetFramework>net5.0</TestInfraTargetFramework>
   </PropertyGroup>
 
 </Project>