Consolidate NetCoreAppCurrent properties (#35953)

diff --git a/eng/Configurations.props b/eng/Configurations.props
index 06f1aac..06ee77b 100644 (file)
--- a/eng/Configurations.props
+++ b/eng/Configurations.props
@@ -17,11 +17,20 @@
 
   <!-- The TFMs to build and test against. -->
   <PropertyGroup>
-    <NETCoreAppCurrentVersion>5.0</NETCoreAppCurrentVersion>
-    <NetCoreAppCurrentTargetFrameworkMoniker>.NETCoreApp,Version=v$(NETCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
-    <NetCoreAppCurrent>net$(NETCoreAppCurrentVersion)</NetCoreAppCurrent>
-    <NetFrameworkCurrent>net472</NetFrameworkCurrent>
+    <!--
+      TODO: Update to $(MajorVersion).$(MinorVersion) when all sub-repos import
+      Arcade at the beginning (SkipImportArcadeSdkFromRoot=false).
+    -->
+    <NetCoreAppCurrentVersion>5.0</NetCoreAppCurrentVersion>
+    <NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
+    <NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
+    <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
+    <!-- Used by Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk. -->
+    <NETCoreAppFramework>$(NetCoreAppCurrent)</NETCoreAppFramework>
     <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
+    <NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
+
+    <NetFrameworkCurrent>net472</NetFrameworkCurrent>
   </PropertyGroup>
 
   <!-- Honor the generic RuntimeConfiguration property. -->

diff --git a/eng/Versions.props b/eng/Versions.props
index 512a4c8..d7de2c4 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,10 +23,6 @@
     <!-- Blob storage container that has the "Latest" channel to publish to. -->
     <ContainerName>dotnet</ContainerName>
     <ChecksumContainerName>$(ContainerName)</ChecksumContainerName>
-    <!-- Max version of NETCoreApp, used by test projects. -->
-    <NETCoreAppMaximumVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppMaximumVersion>
-    <NETCoreAppFrameworkVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppFrameworkVersion>
-    <NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
     <!--
       The NETStandard.Library targeting pack uses this patch version, which does not match the
       runtime's. After publishing a new version of the NETStandard targeting pack in a servicing

diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props
index 17505ae..e882d8b 100644 (file)
--- a/src/installer/Directory.Build.props
+++ b/src/installer/Directory.Build.props
@@ -29,12 +29,6 @@
     <SigningToolsDir>$(InstallerProjectRoot)signing\</SigningToolsDir>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <NETCoreAppFrameworkIdentifier>.NETCoreApp</NETCoreAppFrameworkIdentifier>
-    <NETCoreAppFrameworkMoniker>$(NETCoreAppFrameworkIdentifier),Version=v$(NETCoreAppFrameworkVersion)</NETCoreAppFrameworkMoniker>
-    <NETCoreAppFrameworkBrandName>.NET $(NETCoreAppFrameworkVersion)</NETCoreAppFrameworkBrandName>
-  </PropertyGroup>
-
   <!-- Platform detection -->
   <PropertyGroup>
     <RunningOnUnix Condition="'$(OS)'!='Windows_NT'">true</RunningOnUnix>

diff --git a/src/installer/corehost/build.proj b/src/installer/corehost/build.proj
index 0d6d91e..79f4c0a 100644 (file)
--- a/src/installer/corehost/build.proj
+++ b/src/installer/corehost/build.proj
@@ -6,7 +6,7 @@
     package's targets into the build.
   -->
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

diff --git a/src/installer/pkg/packaging/pack-managed.proj b/src/installer/pkg/packaging/pack-managed.proj
index 5db5f08..acefdff 100644 (file)
--- a/src/installer/pkg/packaging/pack-managed.proj
+++ b/src/installer/pkg/packaging/pack-managed.proj
@@ -2,7 +2,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

diff --git a/src/installer/pkg/packaging/vs-insertion-packages.proj b/src/installer/pkg/packaging/vs-insertion-packages.proj
index f36b24f..fd69aea 100644 (file)
--- a/src/installer/pkg/packaging/vs-insertion-packages.proj
+++ b/src/installer/pkg/packaging/vs-insertion-packages.proj
@@ -2,7 +2,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

diff --git a/src/installer/pkg/projects/Directory.Build.props b/src/installer/pkg/projects/Directory.Build.props
index 40403c6..9d6ae93 100644 (file)
--- a/src/installer/pkg/projects/Directory.Build.props
+++ b/src/installer/pkg/projects/Directory.Build.props
@@ -81,9 +81,9 @@
       null-refs when this isn't set and an analyzer is in the packages
     -->
     <Language>unused</Language>
-    <NuGetTargetMoniker>$(NETCoreAppFrameworkMoniker)</NuGetTargetMoniker>
-    <NuGetTargetMonikerShort>$(NETCoreAppFramework)</NuGetTargetMonikerShort>
-    <PackageTargetFramework>$(NETCoreAppFramework)</PackageTargetFramework>
+    <NuGetTargetMoniker>$(NetCoreAppCurrentTargetFrameworkMoniker)</NuGetTargetMoniker>
+    <NuGetTargetMonikerShort>$(NetCoreAppCurrent)</NuGetTargetMonikerShort>
+    <PackageTargetFramework>$(NetCoreAppCurrent)</PackageTargetFramework>
     <CrossGenOutputPath>$(CrossGenRootPath)$(MSBuildProjectName)\</CrossGenOutputPath>
     <ContainsPackageReferences>true</ContainsPackageReferences>
     <RidSpecificAssets Condition="'$(RuntimeIdentifier)' != ''">true</RidSpecificAssets>
@@ -92,7 +92,7 @@
 
   <PropertyGroup>
     <TargetFramework Condition="'$(TargetFramework)' == ''">$(PackageTargetFramework)</TargetFramework>
-    <TargetFramework Condition="'$(TargetFramework)' == ''">$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework Condition="'$(TargetFramework)' == ''">$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <!-- Add required legal files to packages -->

diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props
index a34488f..cad6d68 100644 (file)
--- a/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props
+++ b/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props
@@ -6,9 +6,9 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>
-    <FrameworkListName>$(NETCoreAppFrameworkBrandName)</FrameworkListName>
-    <FrameworkListTargetFrameworkIdentifier>$(NETCoreAppFrameworkIdentifier)</FrameworkListTargetFrameworkIdentifier>
-    <FrameworkListTargetFrameworkVersion>$(NETCoreAppFrameworkVersion)</FrameworkListTargetFrameworkVersion>
+    <FrameworkListName>$(NetCoreAppCurrentBrandName)</FrameworkListName>
+    <FrameworkListTargetFrameworkIdentifier>$(NetCoreAppCurrentIdentifier)</FrameworkListTargetFrameworkIdentifier>
+    <FrameworkListTargetFrameworkVersion>$(NetCoreAppCurrentVersion)</FrameworkListTargetFrameworkVersion>
     <FrameworkListFrameworkName>$(SharedFrameworkName)</FrameworkListFrameworkName>
   </PropertyGroup>
 

diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props
index 96a1206..03473f6 100644 (file)
--- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props
+++ b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference>
-    <BuildTargetPath>build/$(NETCoreAppFramework)/</BuildTargetPath>
+    <BuildTargetPath>build/$(NetCoreAppCurrent)/</BuildTargetPath>
 
     <IsShipping>false</IsShipping>
   </PropertyGroup>
@@ -17,7 +17,7 @@
     <Dependency
       Include="Microsoft.NETCore.DotNetHostPolicy"
       VersionFromProject="$(InstallerProjectRoot)pkg\projects\Microsoft.NETCore.DotNetHostPolicy\Microsoft.NETCore.DotNetHostPolicy.pkgproj"
-      TargetFramework="$(NETCoreAppFramework)" />
+      TargetFramework="$(NetCoreAppCurrent)" />
   </ItemGroup>
 
 </Project>

diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj
index bf4c13e..a46f804 100644 (file)
--- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj
+++ b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj
@@ -20,8 +20,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Dependency Include="Microsoft.NETCore.Platforms" Version="$(Version)" TargetFramework="$(NETCoreAppFramework)" />
-    <Dependency Include="Microsoft.NETCore.Targets" Version="$(Version)" TargetFramework="$(NETCoreAppFramework)" />
+    <Dependency Include="Microsoft.NETCore.Platforms" Version="$(Version)" TargetFramework="$(NetCoreAppCurrent)" />
+    <Dependency Include="Microsoft.NETCore.Targets" Version="$(Version)" TargetFramework="$(NetCoreAppCurrent)" />
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
index 4431cd5..339c8a2 100644 (file)
--- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
+++ b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
@@ -99,12 +99,12 @@
 
   <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild" BeforeTargets="GetFilesFromPackageResolve">
     <ItemGroup>
-      <LibrariesRefAssemblies TargetPath="ref/$(NETCoreAppFramework)" />
+      <LibrariesRefAssemblies TargetPath="ref/$(NetCoreAppCurrent)" />
       <Reference Include="@(LibrariesRefAssemblies)" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(PackageRID)' != ''">
-      <LibrariesRuntimeFiles Condition="'%(IsNative)' != 'true'" TargetPath="runtimes/$(PackageRID)/lib/$(NETCoreAppFramework)" />
+      <LibrariesRuntimeFiles Condition="'%(IsNative)' != 'true'" TargetPath="runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)" />
       <LibrariesRuntimeFiles Condition="'%(IsNative)' == 'true'" TargetPath="runtimes/$(PackageRID)/native" />
       <ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)" />
     </ItemGroup>

diff --git a/src/installer/publish/Directory.Build.props b/src/installer/publish/Directory.Build.props
index adae9ea..de832e5 100644 (file)
--- a/src/installer/publish/Directory.Build.props
+++ b/src/installer/publish/Directory.Build.props
@@ -3,7 +3,7 @@
   <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <!-- Set IsStableBuild to mimic https://github.com/dotnet/arcade/blob/694d59f090b743f894779d04a7ffe11cbaf352e7/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj#L30-L31 -->

diff --git a/src/installer/signing/Directory.Build.props b/src/installer/signing/Directory.Build.props
index 8fcaf35..7c45d03 100644 (file)
--- a/src/installer/signing/Directory.Build.props
+++ b/src/installer/signing/Directory.Build.props
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
 
     <!-- TODO: (Consolidation) Skip signing steps by default for non-official builds. https://github.com/dotnet/runtime/issues/1026 -->
     <SkipSigning Condition="'$(DotNetSignType)' == ''">true</SkipSigning>

diff --git a/src/installer/test/Assets/TestProjects/AppWithSubDirs/AppWithSubDirs.csproj b/src/installer/test/Assets/TestProjects/AppWithSubDirs/AppWithSubDirs.csproj
index d00c71f..92aed3c 100644 (file)
--- a/src/installer/test/Assets/TestProjects/AppWithSubDirs/AppWithSubDirs.csproj
+++ b/src/installer/test/Assets/TestProjects/AppWithSubDirs/AppWithSubDirs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>

diff --git a/src/installer/test/Assets/TestProjects/AppWithWait/AppWithWait.csproj b/src/installer/test/Assets/TestProjects/AppWithWait/AppWithWait.csproj
index 748e7ab..fd506fe 100644 (file)
--- a/src/installer/test/Assets/TestProjects/AppWithWait/AppWithWait.csproj
+++ b/src/installer/test/Assets/TestProjects/AppWithWait/AppWithWait.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>

diff --git a/src/installer/test/Assets/TestProjects/BundleProbeTester/BundleProbeTester.csproj b/src/installer/test/Assets/TestProjects/BundleProbeTester/BundleProbeTester.csproj
index d563f34..d23f7ab 100644 (file)
--- a/src/installer/test/Assets/TestProjects/BundleProbeTester/BundleProbeTester.csproj
+++ b/src/installer/test/Assets/TestProjects/BundleProbeTester/BundleProbeTester.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>

diff --git a/src/installer/test/Assets/TestProjects/ComLibrary/ComLibrary.csproj b/src/installer/test/Assets/TestProjects/ComLibrary/ComLibrary.csproj
index 07612ef..637cbf4 100644 (file)
--- a/src/installer/test/Assets/TestProjects/ComLibrary/ComLibrary.csproj
+++ b/src/installer/test/Assets/TestProjects/ComLibrary/ComLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj b/src/installer/test/Assets/TestProjects/ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj
index 07612ef..637cbf4 100644 (file)
--- a/src/installer/test/Assets/TestProjects/ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj
+++ b/src/installer/test/Assets/TestProjects/ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj b/src/installer/test/Assets/TestProjects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj
index 07612ef..637cbf4 100644 (file)
--- a/src/installer/test/Assets/TestProjects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj
+++ b/src/installer/test/Assets/TestProjects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/ComponentWithNoDependencies/ComponentWithNoDependencies.csproj b/src/installer/test/Assets/TestProjects/ComponentWithNoDependencies/ComponentWithNoDependencies.csproj
index 9ca4904..27861fa 100644 (file)
--- a/src/installer/test/Assets/TestProjects/ComponentWithNoDependencies/ComponentWithNoDependencies.csproj
+++ b/src/installer/test/Assets/TestProjects/ComponentWithNoDependencies/ComponentWithNoDependencies.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>

diff --git a/src/installer/test/Assets/TestProjects/HostApiInvokerApp/HostApiInvokerApp.csproj b/src/installer/test/Assets/TestProjects/HostApiInvokerApp/HostApiInvokerApp.csproj
index 1f7b037..570b3ef 100644 (file)
--- a/src/installer/test/Assets/TestProjects/HostApiInvokerApp/HostApiInvokerApp.csproj
+++ b/src/installer/test/Assets/TestProjects/HostApiInvokerApp/HostApiInvokerApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
     <DefineConstants Condition="'$(OS)' == 'Windows_NT'">WINDOWS;$(DefineConstants)</DefineConstants>

diff --git a/src/installer/test/Assets/TestProjects/LightupClient/LightupClient.csproj b/src/installer/test/Assets/TestProjects/LightupClient/LightupClient.csproj
index 01dead6..f413feb 100644 (file)
--- a/src/installer/test/Assets/TestProjects/LightupClient/LightupClient.csproj
+++ b/src/installer/test/Assets/TestProjects/LightupClient/LightupClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/installer/test/Assets/TestProjects/LightupLib/LightupLib.csproj b/src/installer/test/Assets/TestProjects/LightupLib/LightupLib.csproj
index a6203fb..e7fb1c6 100644 (file)
--- a/src/installer/test/Assets/TestProjects/LightupLib/LightupLib.csproj
+++ b/src/installer/test/Assets/TestProjects/LightupLib/LightupLib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/installer/test/Assets/TestProjects/LocalizedApp/LocalizedApp.csproj b/src/installer/test/Assets/TestProjects/LocalizedApp/LocalizedApp.csproj
index eab5061..dd7e2b6 100644 (file)
--- a/src/installer/test/Assets/TestProjects/LocalizedApp/LocalizedApp.csproj
+++ b/src/installer/test/Assets/TestProjects/LocalizedApp/LocalizedApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>

diff --git a/src/installer/test/Assets/TestProjects/PortableApp/PortableApp.csproj b/src/installer/test/Assets/TestProjects/PortableApp/PortableApp.csproj
index f4c6cb4..0a72b6b 100644 (file)
--- a/src/installer/test/Assets/TestProjects/PortableApp/PortableApp.csproj
+++ b/src/installer/test/Assets/TestProjects/PortableApp/PortableApp.csproj
@@ -3,7 +3,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/installer/test/Assets/TestProjects/PortableAppWithException/PortableAppWithException.csproj b/src/installer/test/Assets/TestProjects/PortableAppWithException/PortableAppWithException.csproj
index 01dead6..f413feb 100644 (file)
--- a/src/installer/test/Assets/TestProjects/PortableAppWithException/PortableAppWithException.csproj
+++ b/src/installer/test/Assets/TestProjects/PortableAppWithException/PortableAppWithException.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/installer/test/Assets/TestProjects/PortableAppWithLongPath/PortableAppWithLongPath.csproj b/src/installer/test/Assets/TestProjects/PortableAppWithLongPath/PortableAppWithLongPath.csproj
index 01dead6..f413feb 100644 (file)
--- a/src/installer/test/Assets/TestProjects/PortableAppWithLongPath/PortableAppWithLongPath.csproj
+++ b/src/installer/test/Assets/TestProjects/PortableAppWithLongPath/PortableAppWithLongPath.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/installer/test/Assets/TestProjects/PortableAppWithMissingRef/PortableAppWithMissingRef.csproj b/src/installer/test/Assets/TestProjects/PortableAppWithMissingRef/PortableAppWithMissingRef.csproj
index dc7dc9d..17d3f05 100644 (file)
--- a/src/installer/test/Assets/TestProjects/PortableAppWithMissingRef/PortableAppWithMissingRef.csproj
+++ b/src/installer/test/Assets/TestProjects/PortableAppWithMissingRef/PortableAppWithMissingRef.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>

diff --git a/src/installer/test/Assets/TestProjects/PortableAppWithMissingRef/SharedLibrary/ReferenceLibrary.csproj b/src/installer/test/Assets/TestProjects/PortableAppWithMissingRef/SharedLibrary/ReferenceLibrary.csproj
index 427e95c..715eb54 100644 (file)
--- a/src/installer/test/Assets/TestProjects/PortableAppWithMissingRef/SharedLibrary/ReferenceLibrary.csproj
+++ b/src/installer/test/Assets/TestProjects/PortableAppWithMissingRef/SharedLibrary/ReferenceLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
     <AssemblyName>SharedLibrary</AssemblyName>

diff --git a/src/installer/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj b/src/installer/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj
index 59707bc..26b183b 100644 (file)
--- a/src/installer/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj
+++ b/src/installer/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.4;portable-net451+win8</PackageTargetFallback>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>

diff --git a/src/installer/test/Assets/TestProjects/ResourceLookup/ResourceLookup.csproj b/src/installer/test/Assets/TestProjects/ResourceLookup/ResourceLookup.csproj
index 0f3bd67..50e675f 100644 (file)
--- a/src/installer/test/Assets/TestProjects/ResourceLookup/ResourceLookup.csproj
+++ b/src/installer/test/Assets/TestProjects/ResourceLookup/ResourceLookup.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/installer/test/Assets/TestProjects/RuntimeProperties/RuntimeProperties.csproj b/src/installer/test/Assets/TestProjects/RuntimeProperties/RuntimeProperties.csproj
index 01dead6..f413feb 100644 (file)
--- a/src/installer/test/Assets/TestProjects/RuntimeProperties/RuntimeProperties.csproj
+++ b/src/installer/test/Assets/TestProjects/RuntimeProperties/RuntimeProperties.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/installer/test/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj b/src/installer/test/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj
index b75d06c..e1f97d2 100644 (file)
--- a/src/installer/test/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj
+++ b/src/installer/test/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/installer/test/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj b/src/installer/test/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj
index 5d5fdfa..0846750 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj
+++ b/src/installer/test/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>

diff --git a/src/installer/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj b/src/installer/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj
index 2c18ac6..42bc434 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj
+++ b/src/installer/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.4;portable-net451+win8</PackageTargetFallback>

diff --git a/src/installer/test/Assets/TestProjects/StartupHook/StartupHook.csproj b/src/installer/test/Assets/TestProjects/StartupHook/StartupHook.csproj
index 07612ef..637cbf4 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHook/StartupHook.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHook/StartupHook.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/StartupHookFake/StartupHookFake.csproj b/src/installer/test/Assets/TestProjects/StartupHookFake/StartupHookFake.csproj
index 30c7a27..f558625 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHookFake/StartupHookFake.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHookFake/StartupHookFake.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/StartupHookWithAssemblyResolver/SharedLibrary/SharedLibrary.csproj b/src/installer/test/Assets/TestProjects/StartupHookWithAssemblyResolver/SharedLibrary/SharedLibrary.csproj
index 2affa76..6c0a57b 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHookWithAssemblyResolver/SharedLibrary/SharedLibrary.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHookWithAssemblyResolver/SharedLibrary/SharedLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/installer/test/Assets/TestProjects/StartupHookWithAssemblyResolver/StartupHookWithAssemblyResolver.csproj b/src/installer/test/Assets/TestProjects/StartupHookWithAssemblyResolver/StartupHookWithAssemblyResolver.csproj
index 3fe7878..e15ced0 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHookWithAssemblyResolver/StartupHookWithAssemblyResolver.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHookWithAssemblyResolver/StartupHookWithAssemblyResolver.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>

diff --git a/src/installer/test/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.csproj b/src/installer/test/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.csproj
index 8726c60..cc51ff2 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/StartupHookWithInstanceMethod/StartupHookWithInstanceMethod.csproj b/src/installer/test/Assets/TestProjects/StartupHookWithInstanceMethod/StartupHookWithInstanceMethod.csproj
index 07612ef..637cbf4 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHookWithInstanceMethod/StartupHookWithInstanceMethod.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHookWithInstanceMethod/StartupHookWithInstanceMethod.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/StartupHookWithMultipleIncorrectSignatures/StartupHookWithMultipleIncorrectSignatures.csproj b/src/installer/test/Assets/TestProjects/StartupHookWithMultipleIncorrectSignatures/StartupHookWithMultipleIncorrectSignatures.csproj
index 07612ef..637cbf4 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHookWithMultipleIncorrectSignatures/StartupHookWithMultipleIncorrectSignatures.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHookWithMultipleIncorrectSignatures/StartupHookWithMultipleIncorrectSignatures.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/StartupHookWithNonPublicMethod/StartupHookWithNonPublicMethod.csproj b/src/installer/test/Assets/TestProjects/StartupHookWithNonPublicMethod/StartupHookWithNonPublicMethod.csproj
index 07612ef..637cbf4 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHookWithNonPublicMethod/StartupHookWithNonPublicMethod.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHookWithNonPublicMethod/StartupHookWithNonPublicMethod.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/StartupHookWithOverload/StartupHookWithOverload.csproj b/src/installer/test/Assets/TestProjects/StartupHookWithOverload/StartupHookWithOverload.csproj
index 07612ef..637cbf4 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHookWithOverload/StartupHookWithOverload.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHookWithOverload/StartupHookWithOverload.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/StartupHookWithParameter/StartupHookWithParameter.csproj b/src/installer/test/Assets/TestProjects/StartupHookWithParameter/StartupHookWithParameter.csproj
index 07612ef..637cbf4 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHookWithParameter/StartupHookWithParameter.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHookWithParameter/StartupHookWithParameter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/StartupHookWithReturnType/StartupHookWithReturnType.csproj b/src/installer/test/Assets/TestProjects/StartupHookWithReturnType/StartupHookWithReturnType.csproj
index 07612ef..637cbf4 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHookWithReturnType/StartupHookWithReturnType.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHookWithReturnType/StartupHookWithReturnType.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/StartupHookWithoutInitializeMethod/StartupHookWithoutInitializeMethod.csproj b/src/installer/test/Assets/TestProjects/StartupHookWithoutInitializeMethod/StartupHookWithoutInitializeMethod.csproj
index 07612ef..637cbf4 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHookWithoutInitializeMethod/StartupHookWithoutInitializeMethod.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHookWithoutInitializeMethod/StartupHookWithoutInitializeMethod.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/StartupHookWithoutStartupHookType/StartupHookWithoutStartupHookType.csproj b/src/installer/test/Assets/TestProjects/StartupHookWithoutStartupHookType/StartupHookWithoutStartupHookType.csproj
index 07612ef..637cbf4 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StartupHookWithoutStartupHookType/StartupHookWithoutStartupHookType.csproj
+++ b/src/installer/test/Assets/TestProjects/StartupHookWithoutStartupHookType/StartupHookWithoutStartupHookType.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 

diff --git a/src/installer/test/Assets/TestProjects/TestWindowsOsShimsApp/TestWindowsOsShimsApp.csproj b/src/installer/test/Assets/TestProjects/TestWindowsOsShimsApp/TestWindowsOsShimsApp.csproj
index 0ca22a9..adda104 100644 (file)
--- a/src/installer/test/Assets/TestProjects/TestWindowsOsShimsApp/TestWindowsOsShimsApp.csproj
+++ b/src/installer/test/Assets/TestProjects/TestWindowsOsShimsApp/TestWindowsOsShimsApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>

diff --git a/src/installer/test/Assets/TestUtils/TestProjects.props b/src/installer/test/Assets/TestUtils/TestProjects.props
index 97993c1..46ff750 100644 (file)
--- a/src/installer/test/Assets/TestUtils/TestProjects.props
+++ b/src/installer/test/Assets/TestUtils/TestProjects.props
@@ -6,7 +6,7 @@
     in a different manner than using the $(RepositoryEngineeringDir) variable.
   -->
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),global.json))\eng\Versions.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),global.json))\eng\Configurations.props" />
   <Import Project="$(MSBuildThisFileDirectory)MNADeprecationWorkaround.props" />
 
   <PropertyGroup>

diff --git a/src/installer/test/Assets/TestUtils/TestProjects.targets b/src/installer/test/Assets/TestUtils/TestProjects.targets
index 1ee0e94..32180ba 100644 (file)
--- a/src/installer/test/Assets/TestUtils/TestProjects.targets
+++ b/src/installer/test/Assets/TestUtils/TestProjects.targets
@@ -4,12 +4,4 @@
     provides basic info needed for restore and build with the vanilla SDK.
   -->
 
-  <PropertyGroup>
-    <!--
-      Define this here (not just in Versions.props) because the SDK resets it
-      unconditionally in Microsoft.NETCoreSdk.BundledVersions.props.
-    -->
-    <NETCoreAppMaximumVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppMaximumVersion>
-  </PropertyGroup>
-
 </Project>

diff --git a/src/installer/test/Directory.Build.targets b/src/installer/test/Directory.Build.targets
index 82a7c6d..7d93a09 100644 (file)
--- a/src/installer/test/Directory.Build.targets
+++ b/src/installer/test/Directory.Build.targets
@@ -81,7 +81,7 @@
       <TestContextVariable Include="BUILD_ARCHITECTURE=$(TargetArchitecture)" />
       <TestContextVariable Include="BUILD_CONFIGURATION=$(Configuration)" />
       <TestContextVariable Include="MNA_VERSION=$(NETCoreAppRuntimePackageVersion)" />
-      <TestContextVariable Include="MNA_TFM=$(NETCoreAppFramework)" />
+      <TestContextVariable Include="MNA_TFM=$(NetCoreAppCurrent)" />
       <TestContextVariable Include="DOTNET_SDK_PATH=$(DotNetRoot)" />
       <TestContextVariable Include="TEST_ASSETS=$(MSBuildThisFileDirectory)Assets" />
     </ItemGroup>

diff --git a/src/installer/test/TestUtils/TestProjectFixture.cs b/src/installer/test/TestUtils/TestProjectFixture.cs
index b1a6745..5ab37de 100644 (file)
--- a/src/installer/test/TestUtils/TestProjectFixture.cs
+++ b/src/installer/test/TestUtils/TestProjectFixture.cs
@@ -233,7 +233,7 @@ namespace Microsoft.DotNet.CoreSetup.Test
             }
 
             storeArgs.Add($"/p:MNAVersion={RepoDirProvider.MicrosoftNETCoreAppVersion}");
-            storeArgs.Add($"/p:NETCoreAppFramework={Framework}");
+            storeArgs.Add($"/p:NetCoreAppCurrent={Framework}");
 
             // Ensure the project's OutputType isn't 'Exe', since that causes issues with 'dotnet store'
             storeArgs.Add("/p:OutputType=Library");
@@ -286,7 +286,7 @@ namespace Microsoft.DotNet.CoreSetup.Test
             {
                 publishArgs.Add("--framework");
                 publishArgs.Add(framework);
-                publishArgs.Add($"/p:NETCoreAppFramework={framework}");
+                publishArgs.Add($"/p:NetCoreAppCurrent={framework}");
             }
 
             if (selfContained != null)
@@ -333,7 +333,7 @@ namespace Microsoft.DotNet.CoreSetup.Test
             restoreArgs.Add("--disable-parallel");
 
             restoreArgs.Add($"/p:MNAVersion={RepoDirProvider.MicrosoftNETCoreAppVersion}");
-            restoreArgs.Add($"/p:NETCoreAppFramework={Framework}");
+            restoreArgs.Add($"/p:NetCoreAppCurrent={Framework}");
 
             if (extraMSBuildProperties != null)
             {

diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index 8609984..9414103 100644 (file)
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TraversalGlobalProperties>BuildAllProjects=true</TraversalGlobalProperties>
-    <NETCoreAppFrameworkIdentifier>$(TargetFrameworkIdentifier)</NETCoreAppFrameworkIdentifier>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(ContinuousIntegrationBuild)' != 'true'">
@@ -86,7 +85,7 @@
 
     <ItemGroup>
       <_runtimePackLibFiles Include="$(RuntimePackLibDir)*.*">
-        <TargetPath>$(RuntimePackTargetFrameworkPath)/lib/$(NETCoreAppFramework)</TargetPath>
+        <TargetPath>$(RuntimePackTargetFrameworkPath)/lib/$(NetCoreAppCurrent)</TargetPath>
         <IsSymbolFile Condition="$([System.String]::Copy('%(Identity)').EndsWith('pdb'))">true</IsSymbolFile>
       </_runtimePackLibFiles>
       <_runtimePackNativeFiles Include="$(RuntimePackNativeDir)*.*">
@@ -94,9 +93,9 @@
         <IsNative>true</IsNative>
       </_runtimePackNativeFiles>
 
-      <FrameworkListRootAttributes Include="Name" Value=".NET $(NETCoreAppFrameworkVersion)" />
-      <FrameworkListRootAttributes Include="TargetFrameworkIdentifier" Value="$(NETCoreAppFrameworkIdentifier)" />
-      <FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="$(NETCoreAppFrameworkVersion)" />
+      <FrameworkListRootAttributes Include="Name" Value="$(NetCoreAppCurrentBrandName)" />
+      <FrameworkListRootAttributes Include="TargetFrameworkIdentifier" Value="$(NetCoreAppCurrentIdentifier)" />
+      <FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="$(NetCoreAppCurrentVersion)" />
       <FrameworkListRootAttributes Include="FrameworkName" Value="$(SharedFrameworkName)" />
     </ItemGroup>