Removing "netcoreapp" and "netfx" TargetGroup (#457)

* netcoreapp -> netcoreapp5.0 in .sln files

* netcoreapp; -> netcoreapp5.0;  , netcoreapp- to netcoreapp5.0-

* netcoreapp- -> netcoreapp5.0 in .csproj

* 'netcoreapp -> 'netcoreapp5.0 in .csproj

* done with libraries sub folder

* missed semicolon

* minor changes

* netcoreapp -> netcoreapp5.0 in some extra files

* vNext target variable in configurations.props

* netcoreapp => netcoreapp5/0 in some other .props file

* netcoreapp -> vnext in .csproj

* making the netcorepap framework switch work

* fixing sendToHelix and linux build

* TargetFrameworkVNext -> netcoreappCurrent

* case correct netcoreappcurrent

* fixing send to helix zip path

* netfx -> net472 in .sln

* netfx; -> net472; in .props

* netfx- -> net472- in .props

* netfx - -> net472- in .csproj

* 'netfx-> 'net472 in .csproj

* netfx -> net472 manual change

* fixing ci build for netfx

* Not trying to change the global property

* Fixing build failure due to master changes in net https tests

* adding documentaiton and fixing filtering

* netcoreapp -> netcore5.0 in py file

* changing the path to use netcoreapp5.0 version

* feedback and override corefx path corrected in installers

* remaing netcoreapp5.0 changes done

* netcoreapp-> netcoreapp5.0 after live builds

* net472 -> netframeworkcurrent

diff --git a/Directory.Build.props b/Directory.Build.props
index 6c65af6..274f793 100644 (file)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -30,6 +30,7 @@
   <PropertyGroup>
     <NetCoreAppCurrentTargetFrameworkMoniker>.NETCoreApp,Version=v5.0</NetCoreAppCurrentTargetFrameworkMoniker>
     <NetCoreAppCurrent>netcoreapp5.0</NetCoreAppCurrent>
+    <NetFrameworkCurrent>net472</NetFrameworkCurrent>
   </PropertyGroup>
 
   <!--

diff --git a/eng/build.ps1 b/eng/build.ps1
index 9e889c9..efd3ce9 100644 (file)
--- a/eng/build.ps1
+++ b/eng/build.ps1
@@ -121,7 +121,8 @@ foreach ($argument in $PSBoundParameters.Keys)
     "buildtests"        { if ($build -eq $true) { $arguments += " /p:BuildTests=true" } else { $arguments += " -build /p:BuildTests=only" } }
     "test"              { $arguments += " -test" }
     "configuration"     { $configuration = (Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])); $arguments += " /p:ConfigurationGroup=$configuration -configuration $configuration" }
-    "framework"         { $arguments += " /p:TargetGroup=$($PSBoundParameters[$argument].ToLowerInvariant())"}
+    # This should be removed after we have finalized our ci build pipeline.
+    "framework"         { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netcoreapp') { $arguments += " /p:TargetGroup=netcoreapp5.0" } else { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netfx') { $arguments += " /p:TargetGroup=net472" } else { $arguments += " /p:TargetGroup=$($PSBoundParameters[$argument].ToLowerInvariant())"}}}
     "os"                { $arguments += " /p:OSGroup=$($PSBoundParameters[$argument])" }
     "allconfigurations" { $arguments += " /p:BuildAllConfigurations=true" }
     "arch"              { $arguments += " /p:ArchGroup=$($PSBoundParameters[$argument]) /p:TargetArchitecture=$($PSBoundParameters[$argument])" }

diff --git a/eng/build.sh b/eng/build.sh
index 0f9bee0..1aec327 100755 (executable)
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -83,8 +83,14 @@ while [[ $# > 0 ]]; do
       arguments="$arguments /p:ConfigurationGroup=$val -configuration $val"
       shift 2
       ;;
+      # This should be removed after we have finalized our ci build pipeline.
      -framework|-f)
       val="$(echo "$2" | awk '{print tolower($0)}')"
+      if [ "$val" == "netcoreapp" ]; then
+        val=netcoreapp5.0
+      elif [ "$val" == "netfx" ]; then
+        val=net472
+      fi
       arguments="$arguments /p:TargetGroup=$val"
       shift 2
       ;;

diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj
index 1a39a7e..e6219f4 100644 (file)
--- a/eng/common/internal/Tools.csproj
+++ b/eng/common/internal/Tools.csproj
@@ -2,7 +2,7 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>$(NetFrameworkCurrent)</TargetFramework>
     <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
   </PropertyGroup>
   <ItemGroup>

diff --git a/eng/configurations/targetgroups.props b/eng/configurations/targetgroups.props
index b080fbe..39b14d4 100644 (file)
--- a/eng/configurations/targetgroups.props
+++ b/eng/configurations/targetgroups.props
@@ -98,12 +98,6 @@
       <Imports>netcoreapp3.0</Imports>
       <CompatibleWith>netstandard2.1</CompatibleWith>
     </TargetGroups>
-    <!-- netcoreapp is an alias for netcoreapp5.0 -->
-    <TargetGroups Include="netcoreapp">
-      <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-      <Imports>$(NetCoreAppCurrent)</Imports>
-      <CompatibleWith>netstandard2.1</CompatibleWith>
-    </TargetGroups>
     <TargetGroups Include="net45">
       <TargetFramework>net45</TargetFramework>
       <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.5</TargetingPackNugetPackageId>
@@ -157,13 +151,6 @@
       <Imports>net471</Imports>
       <CompatibleWith>netstandard2.0</CompatibleWith>
     </TargetGroups>
-    <!-- netfx is an alias for net472 -->
-    <TargetGroups Include="netfx">
-      <TargetFramework>net472</TargetFramework>
-      <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.7.2</TargetingPackNugetPackageId>
-      <Imports>net472</Imports>
-      <CompatibleWith>netstandard2.0</CompatibleWith>
-    </TargetGroups>
     <TargetGroups Include="win8">
       <TargetFramework>win8</TargetFramework>
       <TargetFrameworkIdentifier>Windows</TargetFrameworkIdentifier>

diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile
index 9f1cf4e..30813d2 100644 (file)
--- a/eng/docker/libraries-sdk.linux.Dockerfile
+++ b/eng/docker/libraries-sdk.linux.Dockerfile
@@ -14,7 +14,7 @@ RUN ./libraries.sh -c $CONFIGURATION
 FROM $SDK_BASE_IMAGE as target
 
 ARG TESTHOST_LOCATION=/repo/artifacts/bin/testhost
-ARG TFM=netcoreapp
+ARG TFM=netcoreapp5.0
 ARG OS=Linux
 ARG ARCH=x64
 ARG CONFIGURATION=Release

diff --git a/eng/docker/libraries-sdk.windows.Dockerfile b/eng/docker/libraries-sdk.windows.Dockerfile
index 06a6dc6..5954ae3 100644 (file)
--- a/eng/docker/libraries-sdk.windows.Dockerfile
+++ b/eng/docker/libraries-sdk.windows.Dockerfile
@@ -4,7 +4,7 @@ ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/core/sdk:3.0.100-nanoserver-1809
 FROM $SDK_BASE_IMAGE as target
 
 ARG TESTHOST_LOCATION=".\\artifacts\\bin\\testhost"
-ARG TFM=netcoreapp
+ARG TFM=netcoreapp5.0
 ARG OS=Windows_NT
 ARG ARCH=x64
 ARG CONFIGURATION=Release

diff --git a/eng/illink.targets b/eng/illink.targets
index 924122b..640a088 100644 (file)
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -11,7 +11,7 @@
   <PropertyGroup>
     <ILLinkTasksDir>$([MSBuild]::NormalizeDirectory('$(PkgILLink_Tasks)', 'tools'))</ILLinkTasksDir>
     <ILLinkTasksPath Condition="'$(ILLinkTasksPath)' == '' and '$(MSBuildRuntimeType)' == 'core'">$(ILLinkTasksDir)netcoreapp2.0/ILLink.Tasks.dll</ILLinkTasksPath>
-    <ILLinkTasksPath Condition="'$(ILLinkTasksPath)' == '' and '$(MSBuildRuntimeType)' != 'core'">$(ILLinkTasksDir)net472/ILLink.Tasks.dll</ILLinkTasksPath>
+    <ILLinkTasksPath Condition="'$(ILLinkTasksPath)' == '' and '$(MSBuildRuntimeType)' != 'core'">$(ILLinkTasksDir)$(NetFrameworkCurrent)/ILLink.Tasks.dll</ILLinkTasksPath>
     <ILLinkTrimAssemblyPath>$(IntermediateOutputPath)$(TargetName)$(TargetExt)</ILLinkTrimAssemblyPath>
     <ILLinkTrimAssemblySymbols>$(IntermediateOutputPath)$(TargetName).pdb</ILLinkTrimAssemblySymbols>
     <ILLinkTrimInputPath>$(IntermediateOutputPath)PreTrim/</ILLinkTrimInputPath>

diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index 63d8d1b..9065ac6 100644 (file)
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -7,10 +7,10 @@
     <LibrariesConfiguration Condition="'$(LibrariesConfiguration)' == ''">$(Configuration)</LibrariesConfiguration>
     <CoreCLRArtifactsPath Condition="'$(CoreCLRArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(CoreCLROSGroup).$(TargetArchitecture).$(CoreCLRConfiguration)'))</CoreCLRArtifactsPath>
     <LibrariesSharedFrameworkRefArtifactsPath Condition="'$(LibrariesSharedFrameworkRefArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)'))</LibrariesSharedFrameworkRefArtifactsPath>
-    <LibrariesAllRefArtifactsPath Condition="'$(LibrariesAllRefArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'netcoreapp'))</LibrariesAllRefArtifactsPath>
-    <LibrariesSharedFrameworkBinArtifactsPath Condition="'$(LibrariesSharedFrameworkBinArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'netcoreapp', 'runtime', '$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)'))</LibrariesSharedFrameworkBinArtifactsPath>
-    <LibrariesAllBinArtifactsPath Condition="'$(LibrariesAllBinArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'runtime', 'netcoreapp-$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)'))</LibrariesAllBinArtifactsPath>
-    <LibrariesNativeArtifactsPath Condition="'$(LibrariesNativeArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', 'netcoreapp-$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)'))</LibrariesNativeArtifactsPath>
+    <LibrariesAllRefArtifactsPath Condition="'$(LibrariesAllRefArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', '$(NetCoreAppCurrent)'))</LibrariesAllRefArtifactsPath>
+    <LibrariesSharedFrameworkBinArtifactsPath Condition="'$(LibrariesSharedFrameworkBinArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', '$(NetCoreAppCurrent)', 'runtime', '$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)'))</LibrariesSharedFrameworkBinArtifactsPath>
+    <LibrariesAllBinArtifactsPath Condition="'$(LibrariesAllBinArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'runtime', '$(NetCoreAppCurrent)-$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)'))</LibrariesAllBinArtifactsPath>
+    <LibrariesNativeArtifactsPath Condition="'$(LibrariesNativeArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', '$(NetCoreAppCurrent)-$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)'))</LibrariesNativeArtifactsPath>
     <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm64' and '$(BuildArchitecture)' != 'arm64'">x64</CoreCLRCrossTargetComponentDirName>
     <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' != 'arm' and '$(TargetsWindows)' == 'true'">x86</CoreCLRCrossTargetComponentDirName>
     <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' != 'arm' and '$(TargetsLinux)' == 'true'">x64</CoreCLRCrossTargetComponentDirName>

diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml
index ddfa967..710dfed 100644 (file)
--- a/eng/pipelines/libraries/build-job.yml
+++ b/eng/pipelines/libraries/build-job.yml
@@ -120,8 +120,8 @@ jobs:
           - task: CopyFiles@2
             displayName: Prepare shared framework runtime folder to publish
             inputs:
-              sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/pkg/${{ parameters.framework }}/runtime
-              targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/pkg/${{ parameters.framework }}/runtime
+              sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/pkg/netcoreapp5.0/runtime # The hardcoded target framework should be removed when we drop the support for versionless targetframeworks from ci.
+              targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/pkg/netcoreapp5.0/runtime
 
           - task: CopyFiles@2
             displayName: Prepare docs folder to publish

diff --git a/eng/testing/xunit/xunit.targets b/eng/testing/xunit/xunit.targets
index 9e637df..ab1430a 100644 (file)
--- a/eng/testing/xunit/xunit.targets
+++ b/eng/testing/xunit/xunit.targets
@@ -16,7 +16,10 @@
     <_withoutCategories Condition="'$(TestScope)' == '' or '$(TestScope)' == 'innerloop'">$(_withoutCategories);OuterLoop</_withoutCategories>
     <_withoutCategories Condition="!$(_withCategories.Contains('failing'))">$(_withoutCategories);failing</_withoutCategories>
 
-    <_withoutCategories>$(_withoutCategories);non$(_bc_TargetGroup)tests</_withoutCategories>
+    <_targetGroupCategory Condition="'$(TargetsNetCoreApp)' == 'true'">netcoreapp</_targetGroupCategory>
+    <_targetGroupCategory Condition="'$(TargetsNetFx)' == 'true'">netfx</_targetGroupCategory>
+
+    <_withoutCategories>$(_withoutCategories);non$(_targetGroupCategory)tests</_withoutCategories>
     <_withoutCategories Condition="'$(TargetOSCategory)' != ''">$(_withoutCategories);$(TargetOSCategory)</_withoutCategories>
   </PropertyGroup>
 

diff --git a/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
index 9d362c9..f64d389 100644 (file)
--- a/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
+++ b/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
@@ -12,7 +12,7 @@
     <_RexcepFilePath Condition=" '$(_RexcepFilePath)' == '' ">$(MSBuildThisFileDirectory)..\vm\rexcep.h</_RexcepFilePath>
     <_ILLinkTrimXmlFilePath Condition=" '$(_ILLinkTrimXmlFilePath)' == '' ">$(MSBuildThisFileDirectory)ILLinkTrim.xml</_ILLinkTrimXmlFilePath>
     <_ILLinkTasksToolsDir>$(PkgILLink_Tasks)/tools</_ILLinkTasksToolsDir>
-    <_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/net472/</_ILLinkTasksDir>
+    <_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/$(NetFrameworkCurrent)/</_ILLinkTasksDir>
     <_ILLinkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_ILLinkTasksToolsDir)/netcoreapp2.0/</_ILLinkTasksDir>
   </PropertyGroup>
 

diff --git a/src/coreclr/tests/dir.common.props b/src/coreclr/tests/dir.common.props
index a549547..4382aa1 100644 (file)
--- a/src/coreclr/tests/dir.common.props
+++ b/src/coreclr/tests/dir.common.props
@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(__SkipFXRestore)' == 'true' AND '$(ReferenceSystemPrivateCoreLib)' != 'true'" >
-    <Reference Include="$(__LocalCoreFXPath)\artifacts\bin\ref\netcoreapp\*.dll" Private="false" />
+    <Reference Include="$(__LocalCoreFXPath)\artifacts\bin\ref\$(NetCoreAppCurrent)\*.dll" Private="false" />
   </ItemGroup>
   
 </Project>

diff --git a/src/coreclr/tests/scripts/run-corefx-tests.py b/src/coreclr/tests/scripts/run-corefx-tests.py
index 1dad960..1ff22dc 100644 (file)
--- a/src/coreclr/tests/scripts/run-corefx-tests.py
+++ b/src/coreclr/tests/scripts/run-corefx-tests.py
@@ -298,7 +298,7 @@ def main(args):
 
     # Gather up some arguments to pass to the different build scripts.
 
-    common_config_args = '-configuration Release -framework netcoreapp -os %s -arch %s' % (clr_os, arch)
+    common_config_args = '-configuration Release -framework netcoreapp5.0 -os %s -arch %s' % (clr_os, arch)
     build_args = '-build -restore'
     build_test_args = '-buildtests  /p:ArchiveTests=true'
 
@@ -339,7 +339,7 @@ def main(args):
                                     'artifacts',
                                     'bin',
                                     'testhost',
-                                    'netcoreapp-%s-%s-%s' % (clr_os, 'Release', arch),
+                                    'netcoreapp5.0-%s-%s-%s' % (clr_os, 'Release', arch),
                                     'shared',
                                     'Microsoft.NETCore.App')
 

diff --git a/src/libraries/Common/Common.Tests.sln b/src/libraries/Common/Common.Tests.sln
index febf1b4..45269df 100644 (file)
--- a/src/libraries/Common/Common.Tests.sln
+++ b/src/libraries/Common/Common.Tests.sln
@@ -11,10 +11,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {C72FD34C-539A-4447-9796-62A229571199}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {C72FD34C-539A-4447-9796-62A229571199}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {C72FD34C-539A-4447-9796-62A229571199}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {C72FD34C-539A-4447-9796-62A229571199}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {C72FD34C-539A-4447-9796-62A229571199}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {C72FD34C-539A-4447-9796-62A229571199}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {C72FD34C-539A-4447-9796-62A229571199}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {C72FD34C-539A-4447-9796-62A229571199}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/Common/tests/Common.Tests.csproj b/src/libraries/Common/tests/Common.Tests.csproj
index 1ffe423..9d61761 100644 (file)
--- a/src/libraries/Common/tests/Common.Tests.csproj
+++ b/src/libraries/Common/tests/Common.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CoverageSupported>false</CoverageSupported>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs">

diff --git a/src/libraries/Common/tests/Configurations.props b/src/libraries/Common/tests/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/Common/tests/Configurations.props
+++ b/src/libraries/Common/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities/Configurations.props b/src/libraries/Common/tests/CoreFx.Private.TestUtilities/Configurations.props
index 7538cfb..4d7a02a 100644 (file)
--- a/src/libraries/Common/tests/CoreFx.Private.TestUtilities/Configurations.props
+++ b/src/libraries/Common/tests/CoreFx.Private.TestUtilities/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj b/src/libraries/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj
index 4c2d987..1a9d2d1 100644 (file)
--- a/src/libraries/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj
+++ b/src/libraries/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj
@@ -6,7 +6,7 @@
       This assembly is referenced from rid agnostic configurations therefore we can't make it RID specific
       and instead use runtime checks.
     -->
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\AdminHelpers.cs" />

diff --git a/src/libraries/Common/tests/StaticTestGenerator/Program.cs b/src/libraries/Common/tests/StaticTestGenerator/Program.cs
index a5b5f02..a3d6b72 100644 (file)
--- a/src/libraries/Common/tests/StaticTestGenerator/Program.cs
+++ b/src/libraries/Common/tests/StaticTestGenerator/Program.cs
@@ -274,7 +274,7 @@ namespace StaticTestGenerator
             // Invalid command line arguments.
             Console.WriteLine("Usage: <output_directory> <helper_assemblies_directory> <test_assembly_path> <xunit_console_options>");
             Console.WriteLine("    Example:");
-            Console.WriteLine(@"   dotnet run d:\tmpoutput d:\repos\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\$(ProductVersion) d:\repos\corefx\artifacts\bin\System.Runtime.Tests\netcoreapp-Windows_NT-Debug\System.Runtime.Tests.dll");
+            Console.WriteLine(@"   dotnet run d:\tmpoutput d:\repos\corefx\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\$(ProductVersion) d:\repos\corefx\artifacts\bin\System.Runtime.Tests\netcoreapp5.0-Windows_NT-Debug\System.Runtime.Tests.dll");
             testAssemblyPath = string.Empty;
             runtimeAssembliesPath = string.Empty;
             outputPath = string.Empty;

diff --git a/src/libraries/Common/tests/StaticTestGenerator/README.md b/src/libraries/Common/tests/StaticTestGenerator/README.md
index 2467b2e..990bf45 100644 (file)
--- a/src/libraries/Common/tests/StaticTestGenerator/README.md
+++ b/src/libraries/Common/tests/StaticTestGenerator/README.md
@@ -22,16 +22,16 @@ From within the utility directory, run the utility with the arguments:
 
 For example:
 ```
-dotnet run d:\output "d:\repos\runtime\artifacts\bin\testhost\netcoreapp-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\5.0.0" "d:\repos\runtime\artifacts\bin\System.Runtime.Tests\netcoreapp-Windows_NT-Debug\System.Runtime.Tests.dll"
+dotnet run d:\output "d:\repos\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\5.0.0" "d:\repos\runtime\artifacts\bin\System.Runtime.Tests\netcoreapp5.0-Windows_NT-Debug\System.Runtime.Tests.dll"
 ```
 This will run the tool and result in output written to the console like:
 ```
-3/27/2019 10:55:37 PM | Test assembly path    : d:\repos\runtime\artifacts\bin\System.Runtime.Tests\netcoreapp-Windows_NT-Debug\System.Runtime.Tests.dll
-3/27/2019 10:55:37 PM | Helper assemblies path: d:\repos\runtime\artifacts\bin\testhost\netcoreapp-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\3.0.0\
+3/27/2019 10:55:37 PM | Test assembly path    : d:\repos\runtime\artifacts\bin\System.Runtime.Tests\netcoreapp5.0-Windows_NT-Debug\System.Runtime.Tests.dll
+3/27/2019 10:55:37 PM | Helper assemblies path: d:\repos\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\3.0.0\
 3/27/2019 10:55:37 PM | Output path           : d:\output\System.Runtime.Tests\
-3/27/2019 10:55:37 PM | Xunit arguments       : d:\repos\runtime\artifacts\bin\System.Runtime.Tests\netcoreapp-Windows_NT-Debug\System.Runtime.Tests.dll -notrait category=nonnetcoreapptests -notrait category=nonwindowstests -notrait category=IgnoreForCI -notrait category=failing -notrait category=OuterLoop
+3/27/2019 10:55:37 PM | Xunit arguments       : d:\repos\runtime\artifacts\bin\System.Runtime.Tests\netcoreapp5.0-Windows_NT-Debug\System.Runtime.Tests.dll -notrait category=nonnetcoreapptests -notrait category=nonwindowstests -notrait category=IgnoreForCI -notrait category=failing -notrait category=OuterLoop
 3/27/2019 10:55:37 PM |
-3/27/2019 10:55:37 PM | Loaded System.Runtime.Tests from d:\repos\runtime\artifacts\bin\System.Runtime.Tests\netcoreapp-Windows_NT-Debug\System.Runtime.Tests.dll
+3/27/2019 10:55:37 PM | Loaded System.Runtime.Tests from d:\repos\runtime\artifacts\bin\System.Runtime.Tests\netcoreapp5.0-Windows_NT-Debug\System.Runtime.Tests.dll
 3/27/2019 10:55:37 PM | Found 5322 test methods.
 3/27/2019 10:55:38 PM | Found 3469 InlineDatas / 949 MethodDatas across 5322 test methods.
 3/27/2019 10:55:38 PM |

diff --git a/src/libraries/Common/tests/System/Xml/XmlCoreTest/Configurations.props b/src/libraries/Common/tests/System/Xml/XmlCoreTest/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/Common/tests/System/Xml/XmlCoreTest/Configurations.props
+++ b/src/libraries/Common/tests/System/Xml/XmlCoreTest/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj b/src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj
index a64f644..0ab1de2 100644 (file)
--- a/src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj
+++ b/src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>XmlCoreTest.Common</RootNamespace>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AsyncUtil.cs" />

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 14b00bc..6129cb6 100644 (file)
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -45,7 +45,7 @@
 
       See Documentation/coding-guidelines/project-guidelines.md for more details on our configurations.
     -->
-    <TargetGroup Condition="'$(TargetGroup)' == ''">netcoreapp</TargetGroup>
+    <TargetGroup Condition="'$(TargetGroup)' == ''">$(NetCoreAppCurrent)</TargetGroup>
     <OSGroup Condition="'$(OSGroup)' == ''">$(DefaultOSGroup)</OSGroup>
     <ConfigurationGroup Condition="'$(ConfigurationGroup)' == ''">Debug</ConfigurationGroup>
     <HostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</HostArch>
@@ -60,6 +60,9 @@
 
     <!-- Initialize BuildConfiguration from the individual properties if it wasn't already explicitly set -->
     <BuildConfiguration Condition="'$(BuildConfiguration)' == ''">$(TargetGroup)-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</BuildConfiguration>
+    <!-- Versionless netcoreapp and netfx needs to be removed after .yml scripts are finalized.-->
+    <BuildConfiguration Condition="'$(TargetGroup)' == 'netcoreapp'">$(NetCoreAppCurrent)-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</BuildConfiguration>
+    <BuildConfiguration Condition="'$(TargetGroup)' == 'netfx'">$(NetFrameworkCurrent)-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</BuildConfiguration>
 
     <!-- if PKGPROJ doesn't set BuildConfigurations, make sure it only builds for TargetGroup=package or BuildAllConfigurations -->
     <BuildConfigurations Condition="'$(MSBuildProjectExtension)' == '.pkgproj' and '$(BuildConfigurations)' == ''">package</BuildConfigurations>
@@ -154,8 +157,8 @@
 
   <!-- set properties for each vertical -->
   <PropertyGroup>
-    <BuildingNETCoreAppVertical Condition="'$(BuildingNETCoreAppVertical)' == '' and ('$(_bc_TargetGroup)'=='netcoreapp' or '$(BuildAllConfigurations)' == 'true')">true</BuildingNETCoreAppVertical>
-    <BuildingNETFxVertical Condition="'$(BuildingNETFxVertical)' == '' and ('$(_bc_TargetGroup)'=='netfx' or '$(BuildAllConfigurations)' == 'true')">true</BuildingNETFxVertical>
+    <BuildingNETCoreAppVertical Condition="'$(BuildingNETCoreAppVertical)' == '' and ('$(_bc_TargetGroup)'=='$(NetCoreAppCurrent)' or '$(BuildAllConfigurations)' == 'true')">true</BuildingNETCoreAppVertical>
+    <BuildingNETFxVertical Condition="'$(BuildingNETFxVertical)' == '' and ('$(_bc_TargetGroup)'=='$(NetFrameworkCurrent)' or '$(BuildAllConfigurations)' == 'true')">true</BuildingNETFxVertical>
     <BinPlaceNETCoreAppPackage Condition="'$(BuildingNETCoreAppVertical)' == 'true'">true</BinPlaceNETCoreAppPackage>
   </PropertyGroup>
 
@@ -255,7 +258,7 @@
     <RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetGroup)'))</RefPath>
     <NetStandard20RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.0'))</NetStandard20RefPath>
     <NetStandard21RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.1'))</NetStandard21RefPath>
-    <NetFxRefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netfx'))</NetFxRefPath>
+    <NetFxRefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(NetFrameworkCurrent)'))</NetFxRefPath>
     <ILAsmToolPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsToolsetDir)', 'ilasm'))</ILAsmToolPath>
 
     <!-- Helix properties -->
@@ -268,10 +271,10 @@
     <TestArchiveRuntimeRoot>$(TestArchiveRoot)runtime/</TestArchiveRuntimeRoot>
 
     <!-- Paths to binplace package content -->
-    <NETCoreAppPackageRefPath>$(ArtifactsBinDir)pkg\netcoreapp\ref</NETCoreAppPackageRefPath>
-    <NETCoreAppPackageRuntimePath>$(ArtifactsBinDir)pkg\netcoreapp\lib</NETCoreAppPackageRuntimePath>
-    <NetFxPackageRefPath>$(ArtifactsBinDir)pkg\netfx\ref</NetFxPackageRefPath>
-    <NetFxPackageRuntimePath>$(ArtifactsBinDir)pkg\netfx\lib</NetFxPackageRuntimePath>
+    <NETCoreAppPackageRefPath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\ref</NETCoreAppPackageRefPath>
+    <NETCoreAppPackageRuntimePath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\lib</NETCoreAppPackageRuntimePath>
+    <NetFxPackageRefPath>$(ArtifactsBinDir)pkg\$(NetFrameworkCurrent)\ref</NetFxPackageRefPath>
+    <NetFxPackageRuntimePath>$(ArtifactsBinDir)pkg\$(NetFrameworkCurrent)\lib</NetFxPackageRuntimePath>
 
     <TestHostRootPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildConfiguration)'))</TestHostRootPath>
 
@@ -303,8 +306,8 @@
 
   <PropertyGroup Condition="'$(BuildAllConfigurations)' != 'true'">
     <!-- We add extra binplacing for the test shared framework until we can get hardlinking with the runtime directory working on all platforms -->
-    <BinPlaceTestSharedFramework Condition="'$(_bc_TargetGroup)' == 'netcoreapp'">true</BinPlaceTestSharedFramework>
-    <BinPlaceNETFXRuntime Condition="'$(_bc_TargetGroup)' == 'netfx'">true</BinPlaceNETFXRuntime>
+    <BinPlaceTestSharedFramework Condition="'$(_bc_TargetGroup)' == '$(NetCoreAppCurrent)'">true</BinPlaceTestSharedFramework>
+    <BinPlaceNETFXRuntime Condition="'$(_bc_TargetGroup)' == '$(NetFrameworkCurrent)'">true</BinPlaceNETFXRuntime>
 
     <NETCoreAppTestSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', 'Microsoft.NETCore.App', '$(ProductVersion)'))</NETCoreAppTestSharedFrameworkPath>
 

diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 6536d32..533f8bd 100644 (file)
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -54,8 +54,8 @@
       <RefPath>$(BuildConfigurationRefPath)</RefPath>
       <RuntimePath>$(RuntimePath)</RuntimePath>
     </BinPlaceConfiguration>
-    <!-- binplace the shared framework -->
-    <BinPlaceConfiguration Condition="'$(IsNETCoreApp)' == 'true' and '$(BuildingNETCoreAppVertical)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)">
+    <!-- binplace to directories for packages -->
+    <BinPlaceConfiguration Condition="'$(IsNETCoreApp)' == 'true' and '$(BuildingNETCoreAppVertical)' == 'true'" Include="$(NetCoreAppCurrent)-$(_bc_OSGroup)">
       <PackageFileRefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(NETCoreAppPackageRefPath)</PackageFileRefPath>
       <PackageFileRuntimePath>$(NETCoreAppPackageRuntimePath)</PackageFileRuntimePath>
       <RuntimePath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime\$(_bc_OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</RuntimePath>
@@ -65,10 +65,10 @@
     </BinPlaceConfiguration>
 
     <!-- Setup the shared framework directory for testing -->
-    <BinPlaceConfiguration Condition="'$(BinPlaceTestSharedFramework)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)">
+    <BinPlaceConfiguration Condition="'$(BinPlaceTestSharedFramework)' == 'true'" Include="$(NetCoreAppCurrent)-$(_bc_OSGroup)">
       <RuntimePath>$(NETCoreAppTestSharedFrameworkPath)</RuntimePath>
     </BinPlaceConfiguration>
-    <BinPlaceConfiguration Condition="'$(BinPlaceNETFXRuntime)' == 'true'" Include="netfx-Windows_NT">
+    <BinPlaceConfiguration Condition="'$(BinPlaceNETFXRuntime)' == 'true'" Include="$(NetFrameworkCurrent)-Windows_NT">
       <RuntimePath>$(TestHostRootPath)</RuntimePath>
     </BinPlaceConfiguration>
 
@@ -88,7 +88,7 @@
       <RefPath>$(RefRootPath)%(Identity)/</RefPath>
     </BinPlaceConfiguration>
     <!-- for BuildAllConfigurations make sure runtimepaths are created for all vertical targetgroups. -->
-    <BinPlaceConfiguration Condition="'$(BuildAllConfigurations)' == 'true' and ('$(BinPlaceForTargetVertical)' == 'true' or '$(_bc_TargetGroup)' != 'netcoreapp')" Include="netcoreapp-$(_bc_OSGroup)">
+    <BinPlaceConfiguration Condition="'$(BuildAllConfigurations)' == 'true' and ('$(BinPlaceForTargetVertical)' == 'true' or '$(_bc_TargetGroup)' != '$(NetCoreAppCurrent)')" Include="$(NetCoreAppCurrent)-$(_bc_OSGroup)">
       <RuntimePath>$(ArtifactsBinDir)runtime/%(Identity)-$(ConfigurationGroup)-$(ArchGroup)</RuntimePath>
     </BinPlaceConfiguration>
 

diff --git a/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln b/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln
index f03803b..954aefa 100644 (file)
--- a/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln
+++ b/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {82B54697-0251-47A1-8546-FC507D0F3B08}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {82B54697-0251-47A1-8546-FC507D0F3B08}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {82B54697-0251-47A1-8546-FC507D0F3B08}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {82B54697-0251-47A1-8546-FC507D0F3B08}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {82B54697-0251-47A1-8546-FC507D0F3B08}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {82B54697-0251-47A1-8546-FC507D0F3B08}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {82B54697-0251-47A1-8546-FC507D0F3B08}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {82B54697-0251-47A1-8546-FC507D0F3B08}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {149D7DFE-2FAC-4A38-89AD-E24CE63AACB8}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {149D7DFE-2FAC-4A38-89AD-E24CE63AACB8}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {149D7DFE-2FAC-4A38-89AD-E24CE63AACB8}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/Microsoft.CSharp/src/Configurations.props b/src/libraries/Microsoft.CSharp/src/Configurations.props
index a5f5bb4..7813482 100644 (file)
--- a/src/libraries/Microsoft.CSharp/src/Configurations.props
+++ b/src/libraries/Microsoft.CSharp/src/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      _netfx;
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.CSharp/tests/Configurations.props b/src/libraries/Microsoft.CSharp/tests/Configurations.props
index 7538cfb..4d7a02a 100644 (file)
--- a/src/libraries/Microsoft.CSharp/tests/Configurations.props
+++ b/src/libraries/Microsoft.CSharp/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj
index ee89be8..084f226 100644 (file)
--- a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj
+++ b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
     <!-- 
     We wish to test operations that would result in
     "Operator '-' cannot be applied to operands of type 'ushort' and 'EnumArithmeticTests.UInt16Enum'"

diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln
index ae21f4f..dbfefa3 100644 (file)
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln
@@ -19,10 +19,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Debug|Any CPU.ActiveCfg = netfx-Debug|Any CPU
-               {0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Debug|Any CPU.Build.0 = netfx-Debug|Any CPU
-               {0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Release|Any CPU.ActiveCfg = netfx-Release|Any CPU
-               {0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Release|Any CPU.Build.0 = netfx-Release|Any CPU
+               {0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Debug|Any CPU.ActiveCfg = net472-Debug|Any CPU
+               {0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Debug|Any CPU.Build.0 = net472-Debug|Any CPU
+               {0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Release|Any CPU.ActiveCfg = net472-Release|Any CPU
+               {0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Release|Any CPU.Build.0 = net472-Release|Any CPU
                {0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Debug|Any CPU.ActiveCfg = net461-Windows_NT-Debug|Any CPU
                {0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Debug|Any CPU.Build.0 = net461-Windows_NT-Debug|Any CPU
                {0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Release|Any CPU.ActiveCfg = net461-Windows_NT-Release|Any CPU

diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Configurations.props b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Configurations.props
index f592aee..bfec1ec 100644 (file)
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Configurations.props
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Configurations.props
@@ -5,7 +5,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netfx-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
index 6a6dfc4..baffe76 100644 (file)
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>Microsoft.Diagnostics.Tracing.EventSource</AssemblyName>
     <NoWarn>$(NoWarn);CS1573</NoWarn>
     <DefineConstants>$(DefineConstants);NO_EVENTCOMMANDEXECUTED_SUPPORT;ES_BUILD_STANDALONE;FEATURE_MANAGED_ETW;PLATFORM_WINDOWS</DefineConstants>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Configurations.props b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Configurations.props
index 49ac1a3..1549319 100644 (file)
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Configurations.props
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj
index ed97cfd..bd9cd2d 100644 (file)
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj
@@ -3,7 +3,7 @@
     <DefineConstants Condition="'$(TargetsNetCoreApp)' == 'true'">$(DefineConstants);FEATURE_ETLEVENTS;FEATURE_EVENTCOUNTER_DISPOSE</DefineConstants>
     <DefineConstants>$(DefineConstants);USE_MDT_EVENTSOURCE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <SDTTestDir>..\..\System.Diagnostics.Tracing\tests</SDTTestDir>

diff --git a/src/libraries/Microsoft.IO.Redist/Microsoft.IO.Redist.sln b/src/libraries/Microsoft.IO.Redist/Microsoft.IO.Redist.sln
index e22e129..c009398 100644 (file)
--- a/src/libraries/Microsoft.IO.Redist/Microsoft.IO.Redist.sln
+++ b/src/libraries/Microsoft.IO.Redist/Microsoft.IO.Redist.sln
@@ -12,10 +12,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {FEF5811F-ED50-4407-A6B9-885EBD3206FB}.Debug|Any CPU.ActiveCfg = netfx-Debug|Any CPU
-               {FEF5811F-ED50-4407-A6B9-885EBD3206FB}.Debug|Any CPU.Build.0 = netfx-Debug|Any CPU
-               {FEF5811F-ED50-4407-A6B9-885EBD3206FB}.Release|Any CPU.ActiveCfg = netfx-Release|Any CPU
-               {FEF5811F-ED50-4407-A6B9-885EBD3206FB}.Release|Any CPU.Build.0 = netfx-Release|Any CPU
+               {FEF5811F-ED50-4407-A6B9-885EBD3206FB}.Debug|Any CPU.ActiveCfg = net472-Debug|Any CPU
+               {FEF5811F-ED50-4407-A6B9-885EBD3206FB}.Debug|Any CPU.Build.0 = net472-Debug|Any CPU
+               {FEF5811F-ED50-4407-A6B9-885EBD3206FB}.Release|Any CPU.ActiveCfg = net472-Release|Any CPU
+               {FEF5811F-ED50-4407-A6B9-885EBD3206FB}.Release|Any CPU.Build.0 = net472-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/Microsoft.IO.Redist/src/Configurations.props b/src/libraries/Microsoft.IO.Redist/src/Configurations.props
index c535e27..200df29 100644 (file)
--- a/src/libraries/Microsoft.IO.Redist/src/Configurations.props
+++ b/src/libraries/Microsoft.IO.Redist/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj b/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
index c6c01b0..e3c85ef 100644 (file)
--- a/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
+++ b/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Microsoft.IO.Redist</AssemblyName>
-    <Configurations>netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
     <DefineConstants>$(DefineConstants);MS_IO_REDIST</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573</NoWarn>

diff --git a/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln b/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
index 98e3b3e..32a3f26 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
+++ b/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {82A4357C-0A9F-4970-AAEA-216A73D8A73E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {82A4357C-0A9F-4970-AAEA-216A73D8A73E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {82A4357C-0A9F-4970-AAEA-216A73D8A73E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {82A4357C-0A9F-4970-AAEA-216A73D8A73E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {82A4357C-0A9F-4970-AAEA-216A73D8A73E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {82A4357C-0A9F-4970-AAEA-216A73D8A73E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {82A4357C-0A9F-4970-AAEA-216A73D8A73E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {82A4357C-0A9F-4970-AAEA-216A73D8A73E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/Microsoft.VisualBasic.Core/ref/Configurations.props b/src/libraries/Microsoft.VisualBasic.Core/ref/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/ref/Configurations.props
+++ b/src/libraries/Microsoft.VisualBasic.Core/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.csproj b/src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.csproj
index 211897c..d379c07 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.csproj
+++ b/src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft.VisualBasic.Core.cs" />

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Configurations.props b/src/libraries/Microsoft.VisualBasic.Core/src/Configurations.props
index ba5e0f7..e865fd9 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Configurations.props
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent);
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
index 4e3d234..db8d142 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
@@ -18,7 +18,7 @@
     <RootNamespace />
     <!-- Disable this as it seems to break windows builds for now. -->
     <DocumentationFile />
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="Microsoft\VisualBasic\Helpers\NativeMethods.vb" />

diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/Configurations.props b/src/libraries/Microsoft.VisualBasic.Core/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/tests/Configurations.props
+++ b/src/libraries/Microsoft.VisualBasic.Core/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft.VisualBasic.Core.Tests.csproj b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft.VisualBasic.Core.Tests.csproj
index ad74aaf..527b447 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft.VisualBasic.Core.Tests.csproj
+++ b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft.VisualBasic.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyAttributes.cs" />

diff --git a/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln b/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
index 7881d22..3643978 100644 (file)
--- a/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
+++ b/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {8FFE99C0-22F8-4462-B839-970EAC1B3472}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {8FFE99C0-22F8-4462-B839-970EAC1B3472}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {8FFE99C0-22F8-4462-B839-970EAC1B3472}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {8FFE99C0-22F8-4462-B839-970EAC1B3472}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {8FFE99C0-22F8-4462-B839-970EAC1B3472}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8FFE99C0-22F8-4462-B839-970EAC1B3472}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8FFE99C0-22F8-4462-B839-970EAC1B3472}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {8FFE99C0-22F8-4462-B839-970EAC1B3472}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/Microsoft.Win32.Primitives/ref/Configurations.props b/src/libraries/Microsoft.Win32.Primitives/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/Microsoft.Win32.Primitives/ref/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Primitives/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj b/src/libraries/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj
index d695ab0..10c6e91 100644 (file)
--- a/src/libraries/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj
+++ b/src/libraries/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Win32.Primitives/src/Configurations.props b/src/libraries/Microsoft.Win32.Primitives/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/Microsoft.Win32.Primitives/src/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Primitives/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
index b481278..4752a85 100644 (file)
--- a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
+++ b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Win32.Primitives/tests/Configurations.props b/src/libraries/Microsoft.Win32.Primitives/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/Microsoft.Win32.Primitives/tests/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Primitives/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj b/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj
index e2b8924..0a6049f 100644 (file)
--- a/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Win32ExceptionTests.cs" />

diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln b/src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln
index 4dd1ded..5fb6f9d 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}.Debug|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Debug|Any CPU
                {0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}.Debug|Any CPU.Build.0 = netstandard2.0-Windows_NT-Debug|Any CPU
                {0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}.Release|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Release|Any CPU

diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Configurations.props b/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Configurations.props
index c920a65..60697bb 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj
index 84535b9..5ddefaf 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft.Win32.Registry.AccessControl.cs" />

diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Configurations.props b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Configurations.props
index cd4cc29..cd93747 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netfx-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj
index c025554..19a854e 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj
@@ -4,7 +4,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <OmitResources Condition="'$(TargetsNetFx)' == 'true'">true</OmitResources>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_RegistryAccessControl</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
     <Reference Include="mscorlib" />

diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props
index c84dc3c..3728310 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj
index afb3675..fb56e66 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="RegistryAclExtensionsTests.cs" />

diff --git a/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln b/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
index 9c3c1e2..942fce4 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
+++ b/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {20A2BA2C-5517-483F-8FFE-643441A59852}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {20A2BA2C-5517-483F-8FFE-643441A59852}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {20A2BA2C-5517-483F-8FFE-643441A59852}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {20A2BA2C-5517-483F-8FFE-643441A59852}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {20A2BA2C-5517-483F-8FFE-643441A59852}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {20A2BA2C-5517-483F-8FFE-643441A59852}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {20A2BA2C-5517-483F-8FFE-643441A59852}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {20A2BA2C-5517-483F-8FFE-643441A59852}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/Microsoft.Win32.Registry/ref/Configurations.props b/src/libraries/Microsoft.Win32.Registry/ref/Configurations.props
index e34056e..b4029b3 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry/ref/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Registry/ref/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      netfx;
+      $(NetFrameworkCurrent);
       net461;
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj
index e5e8504..6635a0e 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj
+++ b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft.Win32.Registry.cs" />

diff --git a/src/libraries/Microsoft.Win32.Registry/src/Configurations.props b/src/libraries/Microsoft.Win32.Registry/src/Configurations.props
index 6c06203..b1d54aa 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry/src/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Registry/src/Configurations.props
@@ -8,9 +8,9 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
index a837c0a..a346f69 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
+++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
@@ -6,7 +6,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS' and '$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_Registry</GeneratePlatformNotSupportedAssemblyMessage>
     <NoWarn Condition="'$(TargetsUnix)' == 'true'">$(NoWarn);CA1823</NoWarn> <!-- Avoid unused fields warnings in Unix build -->
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Unix-Debug;netstandard2.0-Unix-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Unix-Debug;netstandard2.0-Unix-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true' and '$(OSGroup)' != 'AnyOS'">
     <Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.RegistryConstants.cs">

diff --git a/src/libraries/Microsoft.Win32.Registry/tests/Configurations.props b/src/libraries/Microsoft.Win32.Registry/tests/Configurations.props
index d2b1d4d..d4f4961 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry/tests/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Registry/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
index df9f549..bd6bee2 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">

diff --git a/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln b/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln
index 50e9471..2fc4b5a 100644 (file)
--- a/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln
+++ b/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {8B21F7AD-928E-474C-875A-83D753BB8A28}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {8B21F7AD-928E-474C-875A-83D753BB8A28}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {8B21F7AD-928E-474C-875A-83D753BB8A28}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {8B21F7AD-928E-474C-875A-83D753BB8A28}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {91DD22C6-521E-49F9-84E8-1D65BAB97776}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {91DD22C6-521E-49F9-84E8-1D65BAB97776}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {91DD22C6-521E-49F9-84E8-1D65BAB97776}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {91DD22C6-521E-49F9-84E8-1D65BAB97776}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {8B21F7AD-928E-474C-875A-83D753BB8A28}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8B21F7AD-928E-474C-875A-83D753BB8A28}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8B21F7AD-928E-474C-875A-83D753BB8A28}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {8B21F7AD-928E-474C-875A-83D753BB8A28}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {91DD22C6-521E-49F9-84E8-1D65BAB97776}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {91DD22C6-521E-49F9-84E8-1D65BAB97776}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {91DD22C6-521E-49F9-84E8-1D65BAB97776}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {91DD22C6-521E-49F9-84E8-1D65BAB97776}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {90BAFB3A-C396-4323-AC4F-5F968230AD22}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {90BAFB3A-C396-4323-AC4F-5F968230AD22}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {90BAFB3A-C396-4323-AC4F-5F968230AD22}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/Microsoft.Win32.SystemEvents/ref/Configurations.props b/src/libraries/Microsoft.Win32.SystemEvents/ref/Configurations.props
index e34056e..b4029b3 100644 (file)
--- a/src/libraries/Microsoft.Win32.SystemEvents/ref/Configurations.props
+++ b/src/libraries/Microsoft.Win32.SystemEvents/ref/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      netfx;
+      $(NetFrameworkCurrent);
       net461;
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj
index dcc0e51..5617ada 100644 (file)
--- a/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj
+++ b/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft.Win32.SystemEvents.cs" />

diff --git a/src/libraries/Microsoft.Win32.SystemEvents/src/Configurations.props b/src/libraries/Microsoft.Win32.SystemEvents/src/Configurations.props
index cbb889b..0860f33 100644 (file)
--- a/src/libraries/Microsoft.Win32.SystemEvents/src/Configurations.props
+++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Configurations.props
@@ -8,8 +8,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
-      netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
index 7b55806..6538e6b 100644 (file)
--- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
+++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true' and '$(OSGroup)' == 'AnyOS'">SR.PlatformNotSupported_SystemEvents</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' ">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
@@ -146,7 +146,7 @@
     <Compile Include="Microsoft\Win32\UserPreferenceChangingEventArgs.cs" />
     <Compile Include="Microsoft\Win32\UserPreferenceChangingEventHandler.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' != 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' != '$(NetCoreAppCurrent)'">
     <Compile Include="$(CommonPath)System\Runtime\InteropServices\SuppressGCTransitionAttribute.internal.cs">
       <Link>Common\System\Runtime\InteropServices\SuppressGCTransitionAttribute.internal.cs</Link>
     </Compile>

diff --git a/src/libraries/Microsoft.Win32.SystemEvents/tests/Configurations.props b/src/libraries/Microsoft.Win32.SystemEvents/tests/Configurations.props
index d2b1d4d..d4f4961 100644 (file)
--- a/src/libraries/Microsoft.Win32.SystemEvents/tests/Configurations.props
+++ b/src/libraries/Microsoft.Win32.SystemEvents/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
index 59df614..842ef8d 100644 (file)
--- a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">

diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln b/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln
index 6e25f32..1f98759 100644 (file)
--- a/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln
@@ -19,10 +19,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {0D1E2954-A5C7-4B8C-932A-31EB4A96A737}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {0D1E2954-A5C7-4B8C-932A-31EB4A96A737}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {0D1E2954-A5C7-4B8C-932A-31EB4A96A737}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {0D1E2954-A5C7-4B8C-932A-31EB4A96A737}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {0D1E2954-A5C7-4B8C-932A-31EB4A96A737}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {0D1E2954-A5C7-4B8C-932A-31EB4A96A737}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {0D1E2954-A5C7-4B8C-932A-31EB4A96A737}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {0D1E2954-A5C7-4B8C-932A-31EB4A96A737}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {80958E8B-2FEB-4F95-83F9-825CA1ED26F8}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {80958E8B-2FEB-4F95-83F9-825CA1ED26F8}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {80958E8B-2FEB-4F95-83F9-825CA1ED26F8}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Configurations.props b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Configurations.props
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj
index adbab7f..cb7d029 100644 (file)
--- a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);XMLSERIALIZERGENERATORTESTS</DefineConstants>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <CoverageSupported>false</CoverageSupported>
     <SkipTestsOnPlatform Condition="'$(ArchGroup)' == 'arm' or '$(ArchGroup)' == 'arm64' or '$(ArchGroup)' == 'armel' or '$(ArchGroup)' == 'wasm'">true</SkipTestsOnPlatform>
   </PropertyGroup>

diff --git a/src/libraries/Native/native-binplace.proj b/src/libraries/Native/native-binplace.proj
index dac523b..831252e 100644 (file)
--- a/src/libraries/Native/native-binplace.proj
+++ b/src/libraries/Native/native-binplace.proj
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
       netstandard2.0;
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
   <Import Project="..\Directory.Build.props" />

diff --git a/src/libraries/System.AppContext/System.AppContext.sln b/src/libraries/System.AppContext/System.AppContext.sln
index 08260a6..5f6ec6a 100644 (file)
--- a/src/libraries/System.AppContext/System.AppContext.sln
+++ b/src/libraries/System.AppContext/System.AppContext.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {6F04B167-A03F-4206-8481-60213C3EF9B9}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6F04B167-A03F-4206-8481-60213C3EF9B9}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6F04B167-A03F-4206-8481-60213C3EF9B9}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6F04B167-A03F-4206-8481-60213C3EF9B9}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {2D7BBD88-739E-472A-9F44-2794049A688F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2D7BBD88-739E-472A-9F44-2794049A688F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2D7BBD88-739E-472A-9F44-2794049A688F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2D7BBD88-739E-472A-9F44-2794049A688F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {6F04B167-A03F-4206-8481-60213C3EF9B9}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6F04B167-A03F-4206-8481-60213C3EF9B9}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6F04B167-A03F-4206-8481-60213C3EF9B9}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6F04B167-A03F-4206-8481-60213C3EF9B9}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {2D7BBD88-739E-472A-9F44-2794049A688F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2D7BBD88-739E-472A-9F44-2794049A688F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2D7BBD88-739E-472A-9F44-2794049A688F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2D7BBD88-739E-472A-9F44-2794049A688F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.AppContext/ref/Configurations.props b/src/libraries/System.AppContext/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.AppContext/ref/Configurations.props
+++ b/src/libraries/System.AppContext/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.AppContext/ref/System.AppContext.csproj b/src/libraries/System.AppContext/ref/System.AppContext.csproj
index 8e05a9f..7ba345b 100644 (file)
--- a/src/libraries/System.AppContext/ref/System.AppContext.csproj
+++ b/src/libraries/System.AppContext/ref/System.AppContext.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.AppContext.Forwards.cs" />

diff --git a/src/libraries/System.AppContext/src/Configurations.props b/src/libraries/System.AppContext/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.AppContext/src/Configurations.props
+++ b/src/libraries/System.AppContext/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.AppContext/src/System.AppContext.csproj b/src/libraries/System.AppContext/src/System.AppContext.csproj
index 333ca55..09c8bdd 100644 (file)
--- a/src/libraries/System.AppContext/src/System.AppContext.csproj
+++ b/src/libraries/System.AppContext/src/System.AppContext.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.AppContext</AssemblyName>
     <ClsCompliant>true</ClsCompliant>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <ItemGroup>

diff --git a/src/libraries/System.AppContext/tests/Configurations.props b/src/libraries/System.AppContext/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.AppContext/tests/Configurations.props
+++ b/src/libraries/System.AppContext/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj b/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj
index 6612f46..2a150e8 100644 (file)
--- a/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj
+++ b/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Buffers/System.Buffers.sln b/src/libraries/System.Buffers/System.Buffers.sln
index ba69f77..b0ccaed 100644 (file)
--- a/src/libraries/System.Buffers/System.Buffers.sln
+++ b/src/libraries/System.Buffers/System.Buffers.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Buffers/ref/Configurations.props b/src/libraries/System.Buffers/ref/Configurations.props
index d0b1b2c..698e595 100644 (file)
--- a/src/libraries/System.Buffers/ref/Configurations.props
+++ b/src/libraries/System.Buffers/ref/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Buffers/ref/System.Buffers.csproj b/src/libraries/System.Buffers/ref/System.Buffers.csproj
index 60ccf4e..fdc1f67 100644 (file)
--- a/src/libraries/System.Buffers/ref/System.Buffers.csproj
+++ b/src/libraries/System.Buffers/ref/System.Buffers.csproj
@@ -3,7 +3,7 @@
     <!-- Must match version supported by frameworks which support 4.0.* inbox.
          Can be removed when API is added and this assembly is versioned to 4.1.* -->
     <AssemblyVersion>4.0.2.0</AssemblyVersion>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Buffers/src/Configurations.props b/src/libraries/System.Buffers/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Buffers/src/Configurations.props
+++ b/src/libraries/System.Buffers/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Buffers/src/System.Buffers.csproj b/src/libraries/System.Buffers/src/System.Buffers.csproj
index 75809ec..19bd595 100644 (file)
--- a/src/libraries/System.Buffers/src/System.Buffers.csproj
+++ b/src/libraries/System.Buffers/src/System.Buffers.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <ExcludeResourcesImport>true</ExcludeResourcesImport>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Buffers/tests/Configurations.props b/src/libraries/System.Buffers/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Buffers/tests/Configurations.props
+++ b/src/libraries/System.Buffers/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
index 47b0936..64054d1 100644 (file)
--- a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
+++ b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ArrayPool\ArrayPoolTest.cs" />

diff --git a/src/libraries/System.CodeDom/System.CodeDom.sln b/src/libraries/System.CodeDom/System.CodeDom.sln
index 7086ed9..d0310d0 100644 (file)
--- a/src/libraries/System.CodeDom/System.CodeDom.sln
+++ b/src/libraries/System.CodeDom/System.CodeDom.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {53D09AF4-0C13-4197-B8AD-9746F0374E88}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {53D09AF4-0C13-4197-B8AD-9746F0374E88}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {53D09AF4-0C13-4197-B8AD-9746F0374E88}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.CodeDom/ref/Configurations.props b/src/libraries/System.CodeDom/ref/Configurations.props
index d8e7a67..642fe10 100644 (file)
--- a/src/libraries/System.CodeDom/ref/Configurations.props
+++ b/src/libraries/System.CodeDom/ref/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj
index f2aebe0..df45b99 100644 (file)
--- a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj
+++ b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.CodeDom.cs" />

diff --git a/src/libraries/System.CodeDom/src/Configurations.props b/src/libraries/System.CodeDom/src/Configurations.props
index d8e7a67..642fe10 100644 (file)
--- a/src/libraries/System.CodeDom/src/Configurations.props
+++ b/src/libraries/System.CodeDom/src/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.CodeDom/src/System.CodeDom.csproj b/src/libraries/System.CodeDom/src/System.CodeDom.csproj
index 30b119c..07b6744 100644 (file)
--- a/src/libraries/System.CodeDom/src/System.CodeDom.csproj
+++ b/src/libraries/System.CodeDom/src/System.CodeDom.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)'=='true'">true</IsPartialFacadeAssembly>
     <DefineConstants>$(DefineConstants);CODEDOM</DefineConstants>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' == 'true'">
     <Compile Include="Microsoft\CSharp\CSharpCodeGenerator.cs" />

diff --git a/src/libraries/System.CodeDom/tests/Configurations.props b/src/libraries/System.CodeDom/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.CodeDom/tests/Configurations.props
+++ b/src/libraries/System.CodeDom/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj b/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj
index 02982a3..a9bc050 100644 (file)
--- a/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj
+++ b/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\CodeDom\CodeAttributeDeclarationCollectionTests.cs" />

diff --git a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln
index 5d763bd..ffde557 100644 (file)
--- a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln
+++ b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {772CB0A7-3D45-4D3A-B975-671A1937C761}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {772CB0A7-3D45-4D3A-B975-671A1937C761}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {772CB0A7-3D45-4D3A-B975-671A1937C761}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {772CB0A7-3D45-4D3A-B975-671A1937C761}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {772CB0A7-3D45-4D3A-B975-671A1937C761}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {772CB0A7-3D45-4D3A-B975-671A1937C761}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {772CB0A7-3D45-4D3A-B975-671A1937C761}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {772CB0A7-3D45-4D3A-B975-671A1937C761}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Collections.Concurrent/ref/Configurations.props b/src/libraries/System.Collections.Concurrent/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Collections.Concurrent/ref/Configurations.props
+++ b/src/libraries/System.Collections.Concurrent/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj b/src/libraries/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj
index 3369608..6df9076 100644 (file)
--- a/src/libraries/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj
+++ b/src/libraries/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Collections.Concurrent/src/Configurations.props b/src/libraries/System.Collections.Concurrent/src/Configurations.props
index 7e12b46..c31cf2a 100644 (file)
--- a/src/libraries/System.Collections.Concurrent/src/Configurations.props
+++ b/src/libraries/System.Collections.Concurrent/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj b/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj
index 32cb2f8..3930e7e 100644 (file)
--- a/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj
+++ b/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>System.Collections.Concurrent</RootNamespace>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Collections\Concurrent\BlockingCollection.cs" />

diff --git a/src/libraries/System.Collections.Concurrent/tests/Configurations.props b/src/libraries/System.Collections.Concurrent/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Collections.Concurrent/tests/Configurations.props
+++ b/src/libraries/System.Collections.Concurrent/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
index e3ee4fe..4d6d144 100644 (file)
--- a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
+++ b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CoreLibSharedDir)System\Collections\Concurrent\IProducerConsumerCollectionDebugView.cs">

diff --git a/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln b/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln
index 12d6f87..a49fe78 100644 (file)
--- a/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln
+++ b/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {1DD0FF15-6234-4BD6-850A-317F05479554}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {1DD0FF15-6234-4BD6-850A-317F05479554}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {1DD0FF15-6234-4BD6-850A-317F05479554}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {1DD0FF15-6234-4BD6-850A-317F05479554}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {C7EFF4EE-70DC-453B-B817-4AF67921AB03}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C7EFF4EE-70DC-453B-B817-4AF67921AB03}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C7EFF4EE-70DC-453B-B817-4AF67921AB03}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C7EFF4EE-70DC-453B-B817-4AF67921AB03}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {1DD0FF15-6234-4BD6-850A-317F05479554}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {1DD0FF15-6234-4BD6-850A-317F05479554}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {1DD0FF15-6234-4BD6-850A-317F05479554}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {1DD0FF15-6234-4BD6-850A-317F05479554}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {C7EFF4EE-70DC-453B-B817-4AF67921AB03}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C7EFF4EE-70DC-453B-B817-4AF67921AB03}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C7EFF4EE-70DC-453B-B817-4AF67921AB03}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C7EFF4EE-70DC-453B-B817-4AF67921AB03}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Collections.Immutable/ref/Configurations.props b/src/libraries/System.Collections.Immutable/ref/Configurations.props
index 620ac6f..92c9ce3 100644 (file)
--- a/src/libraries/System.Collections.Immutable/ref/Configurations.props
+++ b/src/libraries/System.Collections.Immutable/ref/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj
index 17dfed1..18c3b30 100644 (file)
--- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj
+++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Collections.Immutable.cs" />

diff --git a/src/libraries/System.Collections.Immutable/src/Configurations.props b/src/libraries/System.Collections.Immutable/src/Configurations.props
index 620ac6f..92c9ce3 100644 (file)
--- a/src/libraries/System.Collections.Immutable/src/Configurations.props
+++ b/src/libraries/System.Collections.Immutable/src/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj
index 50428ab..cc52892 100644 (file)
--- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj
+++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>System.Collections.Immutable</RootNamespace>
     <FileAlignment>512</FileAlignment>
     <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.0'">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\InternalsVisibleTo.cs" />

diff --git a/src/libraries/System.Collections.Immutable/tests/Configurations.props b/src/libraries/System.Collections.Immutable/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Collections.Immutable/tests/Configurations.props
+++ b/src/libraries/System.Collections.Immutable/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj
index 4557b10..417af2e 100644 (file)
--- a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj
+++ b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NoWarn>0436</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs" Condition="'$(TargetsNetFx)' == 'true'">

diff --git a/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln b/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
index 896dd8a..d4430cb 100644 (file)
--- a/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
+++ b/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {EE95AE39-845A-42D3-86D0-8065DBE56612}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {EE95AE39-845A-42D3-86D0-8065DBE56612}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {EE95AE39-845A-42D3-86D0-8065DBE56612}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {EE95AE39-845A-42D3-86D0-8065DBE56612}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {585E3764-534B-4A12-8BD5-8578CB826A45}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {585E3764-534B-4A12-8BD5-8578CB826A45}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {585E3764-534B-4A12-8BD5-8578CB826A45}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {585E3764-534B-4A12-8BD5-8578CB826A45}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {8500112F-96BD-47BF-8871-3242089FAE70}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {8500112F-96BD-47BF-8871-3242089FAE70}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {8500112F-96BD-47BF-8871-3242089FAE70}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {8500112F-96BD-47BF-8871-3242089FAE70}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {EE95AE39-845A-42D3-86D0-8065DBE56612}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {EE95AE39-845A-42D3-86D0-8065DBE56612}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {EE95AE39-845A-42D3-86D0-8065DBE56612}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {EE95AE39-845A-42D3-86D0-8065DBE56612}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {585E3764-534B-4A12-8BD5-8578CB826A45}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {585E3764-534B-4A12-8BD5-8578CB826A45}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {585E3764-534B-4A12-8BD5-8578CB826A45}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {585E3764-534B-4A12-8BD5-8578CB826A45}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {8500112F-96BD-47BF-8871-3242089FAE70}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {8500112F-96BD-47BF-8871-3242089FAE70}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {8500112F-96BD-47BF-8871-3242089FAE70}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {8500112F-96BD-47BF-8871-3242089FAE70}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Collections.NonGeneric/ref/Configurations.props b/src/libraries/System.Collections.NonGeneric/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Collections.NonGeneric/ref/Configurations.props
+++ b/src/libraries/System.Collections.NonGeneric/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj b/src/libraries/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj
index 98c169a..51e5556 100644 (file)
--- a/src/libraries/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj
+++ b/src/libraries/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Collections.NonGeneric/src/Configurations.props b/src/libraries/System.Collections.NonGeneric/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Collections.NonGeneric/src/Configurations.props
+++ b/src/libraries/System.Collections.NonGeneric/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj
index 1c44bee..9cf8eed 100644 (file)
--- a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj
+++ b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj
@@ -3,7 +3,7 @@
     <RootNamespace>System.Collections.NonGeneric</RootNamespace>
     <AssemblyName>System.Collections.NonGeneric</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Collections.NonGeneric/tests/Configurations.props b/src/libraries/System.Collections.NonGeneric/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Collections.NonGeneric/tests/Configurations.props
+++ b/src/libraries/System.Collections.NonGeneric/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
index 34b62bb..d0a568d 100644 (file)
--- a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
+++ b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <!-- Common Collections tests -->

diff --git a/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln b/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln
index fe2a430..25d97af 100644 (file)
--- a/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln
+++ b/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {63634289-90D7-4947-8BF3-DBBE98D76C85}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {63634289-90D7-4947-8BF3-DBBE98D76C85}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {63634289-90D7-4947-8BF3-DBBE98D76C85}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {63634289-90D7-4947-8BF3-DBBE98D76C85}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {63634289-90D7-4947-8BF3-DBBE98D76C85}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {63634289-90D7-4947-8BF3-DBBE98D76C85}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {63634289-90D7-4947-8BF3-DBBE98D76C85}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {63634289-90D7-4947-8BF3-DBBE98D76C85}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Collections.Specialized/ref/Configurations.props b/src/libraries/System.Collections.Specialized/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Collections.Specialized/ref/Configurations.props
+++ b/src/libraries/System.Collections.Specialized/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj b/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj
index 6ed79be..7c6ca93 100644 (file)
--- a/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj
+++ b/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Collections.Specialized/src/Configurations.props b/src/libraries/System.Collections.Specialized/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Collections.Specialized/src/Configurations.props
+++ b/src/libraries/System.Collections.Specialized/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj
index 84ecdd0..2890f5e 100644 (file)
--- a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj
+++ b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>System.Collections.Specialized</RootNamespace>
     <AssemblyName>System.Collections.Specialized</AssemblyName>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Collections.Specialized/tests/Configurations.props b/src/libraries/System.Collections.Specialized/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Collections.Specialized/tests/Configurations.props
+++ b/src/libraries/System.Collections.Specialized/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj b/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
index 53a747b..d7530aa 100644 (file)
--- a/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
+++ b/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <!-- Common Collections tests -->

diff --git a/src/libraries/System.Collections/System.Collections.sln b/src/libraries/System.Collections/System.Collections.sln
index c71e692..9834d1d 100644 (file)
--- a/src/libraries/System.Collections/System.Collections.sln
+++ b/src/libraries/System.Collections/System.Collections.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {F5EB9630-AD29-4880-963F-F2D39C684D8A}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F5EB9630-AD29-4880-963F-F2D39C684D8A}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F5EB9630-AD29-4880-963F-F2D39C684D8A}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F5EB9630-AD29-4880-963F-F2D39C684D8A}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {C746D448-E7C3-4850-9CA7-D3F1FA49742F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C746D448-E7C3-4850-9CA7-D3F1FA49742F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C746D448-E7C3-4850-9CA7-D3F1FA49742F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C746D448-E7C3-4850-9CA7-D3F1FA49742F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {F5EB9630-AD29-4880-963F-F2D39C684D8A}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F5EB9630-AD29-4880-963F-F2D39C684D8A}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F5EB9630-AD29-4880-963F-F2D39C684D8A}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F5EB9630-AD29-4880-963F-F2D39C684D8A}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {C746D448-E7C3-4850-9CA7-D3F1FA49742F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C746D448-E7C3-4850-9CA7-D3F1FA49742F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C746D448-E7C3-4850-9CA7-D3F1FA49742F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C746D448-E7C3-4850-9CA7-D3F1FA49742F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Collections/ref/Configurations.props b/src/libraries/System.Collections/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Collections/ref/Configurations.props
+++ b/src/libraries/System.Collections/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Collections/ref/System.Collections.csproj b/src/libraries/System.Collections/ref/System.Collections.csproj
index e3e8946..8505498 100644 (file)
--- a/src/libraries/System.Collections/ref/System.Collections.csproj
+++ b/src/libraries/System.Collections/ref/System.Collections.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Collections/src/Configurations.props b/src/libraries/System.Collections/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Collections/src/Configurations.props
+++ b/src/libraries/System.Collections/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Collections/src/System.Collections.csproj b/src/libraries/System.Collections/src/System.Collections.csproj
index d3037f0..8509e28 100644 (file)
--- a/src/libraries/System.Collections/src/System.Collections.csproj
+++ b/src/libraries/System.Collections/src/System.Collections.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Collections</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->

diff --git a/src/libraries/System.Collections/tests/Configurations.props b/src/libraries/System.Collections/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Collections/tests/Configurations.props
+++ b/src/libraries/System.Collections/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj
index 8b80191..933bd43 100644 (file)
--- a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj
+++ b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln b/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
index cd86ad8..eb4b75e 100644 (file)
--- a/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
+++ b/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {4266D58F-EB60-46C2-BA81-3ABDE759A7D5}.Debug|Any CPU.ActiveCfg = netstandard2.1-Debug|Any CPU
                {4266D58F-EB60-46C2-BA81-3ABDE759A7D5}.Debug|Any CPU.Build.0 = netstandard2.1-Debug|Any CPU
                {4266D58F-EB60-46C2-BA81-3ABDE759A7D5}.Release|Any CPU.ActiveCfg = netstandard2.1-Release|Any CPU

diff --git a/src/libraries/System.ComponentModel.Annotations/tests/Configurations.props b/src/libraries/System.ComponentModel.Annotations/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.ComponentModel.Annotations/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel.Annotations/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj b/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj
index 9f645e7..8fe3a06 100644 (file)
--- a/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj
+++ b/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\ComponentModel\DataAnnotations\AssociatedMetadataTypeTypeDescriptionProviderTests.cs" />

diff --git a/src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln b/src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln
index 4715f9a..c2e62e7 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln
+++ b/src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {0F8CFFA3-6E16-4642-82C1-289D95338D7C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {0F8CFFA3-6E16-4642-82C1-289D95338D7C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {0F8CFFA3-6E16-4642-82C1-289D95338D7C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {0F8CFFA3-6E16-4642-82C1-289D95338D7C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {0F8CFFA3-6E16-4642-82C1-289D95338D7C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {0F8CFFA3-6E16-4642-82C1-289D95338D7C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {0F8CFFA3-6E16-4642-82C1-289D95338D7C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {0F8CFFA3-6E16-4642-82C1-289D95338D7C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {E3663E26-6819-4997-B372-94454DB4D60E}.Debug|Any CPU.ActiveCfg = netstandard2.1-Debug|Any CPU
                {E3663E26-6819-4997-B372-94454DB4D60E}.Debug|Any CPU.Build.0 = netstandard2.1-Debug|Any CPU
                {E3663E26-6819-4997-B372-94454DB4D60E}.Release|Any CPU.ActiveCfg = netstandard2.1-Release|Any CPU

diff --git a/src/libraries/System.ComponentModel.Composition.Registration/tests/Configurations.props b/src/libraries/System.ComponentModel.Composition.Registration/tests/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition.Registration/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel.Composition.Registration/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj b/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
index 1521c75..2e6eb27 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
+++ b/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="InternalCalls.cs" />

diff --git a/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln b/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln
index 6cfffaa..88db40e 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln
+++ b/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln
@@ -31,18 +31,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {59F4682D-C41D-45A7-9798-16C75525BB1D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {59F4682D-C41D-45A7-9798-16C75525BB1D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {59F4682D-C41D-45A7-9798-16C75525BB1D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {59F4682D-C41D-45A7-9798-16C75525BB1D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {59F4682D-C41D-45A7-9798-16C75525BB1D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {59F4682D-C41D-45A7-9798-16C75525BB1D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {59F4682D-C41D-45A7-9798-16C75525BB1D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {59F4682D-C41D-45A7-9798-16C75525BB1D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {396D6EBF-60BD-4DAF-8783-FB403E070A56}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {396D6EBF-60BD-4DAF-8783-FB403E070A56}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {396D6EBF-60BD-4DAF-8783-FB403E070A56}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
                {396D6EBF-60BD-4DAF-8783-FB403E070A56}.Release|Any CPU.Build.0 = netstandard2.0-Release|Any CPU
-               {2D694AC8-A12F-4622-9405-74E20EC40C3A}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2D694AC8-A12F-4622-9405-74E20EC40C3A}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2D694AC8-A12F-4622-9405-74E20EC40C3A}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2D694AC8-A12F-4622-9405-74E20EC40C3A}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {2D694AC8-A12F-4622-9405-74E20EC40C3A}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2D694AC8-A12F-4622-9405-74E20EC40C3A}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2D694AC8-A12F-4622-9405-74E20EC40C3A}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2D694AC8-A12F-4622-9405-74E20EC40C3A}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {DD3B8052-CE03-4159-8311-1CE1382C51B0}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {DD3B8052-CE03-4159-8311-1CE1382C51B0}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {DD3B8052-CE03-4159-8311-1CE1382C51B0}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.ComponentModel.Composition/ref/Configurations.props b/src/libraries/System.ComponentModel.Composition/ref/Configurations.props
index b1a4530..d196aeb 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition/ref/Configurations.props
+++ b/src/libraries/System.ComponentModel.Composition/ref/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      _netfx;
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.ComponentModel.Composition/src/Configurations.props b/src/libraries/System.ComponentModel.Composition/src/Configurations.props
index 0e7cb0f..b44f08e 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition/src/Configurations.props
+++ b/src/libraries/System.ComponentModel.Composition/src/Configurations.props
@@ -6,8 +6,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      _netfx;
-      netcoreapp;
+      _$(NetFrameworkCurrent);
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj
index cb788f6..f7067b4 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj
+++ b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj
@@ -6,7 +6,7 @@
     <!-- CommonStrings needs RootNamespace to be empty -->
     <NoWarn>$(NoWarn);CS1573</NoWarn>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_ComponentModel_Composition</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp2.0-Debug;netcoreapp2.0-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp2.0-Debug;netcoreapp2.0-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TypeForwards.cs" />

diff --git a/src/libraries/System.ComponentModel.Composition/tests/Configurations.props b/src/libraries/System.ComponentModel.Composition/tests/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel.Composition/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
index dd775fc..45cf78a 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
+++ b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- TODO: Add netfx configuration after OOB package bug is fixed: https://github.com/dotnet/corefx/issues/23889 -->
+  <!-- TODO: Add net472 configuration after OOB package bug is fixed: https://github.com/dotnet/corefx/issues/23889 -->
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. -->

diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln b/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
index 3e6a0f0..7588fef 100644 (file)
--- a/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {59E9B218-81D0-4A80-A4B7-66C716136D82}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {59E9B218-81D0-4A80-A4B7-66C716136D82}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {59E9B218-81D0-4A80-A4B7-66C716136D82}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {59E9B218-81D0-4A80-A4B7-66C716136D82}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {551A6340-8EEF-445E-A2A2-639CC23DBD36}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {551A6340-8EEF-445E-A2A2-639CC23DBD36}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {551A6340-8EEF-445E-A2A2-639CC23DBD36}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {551A6340-8EEF-445E-A2A2-639CC23DBD36}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {E7943063-5DB9-4EC6-86DD-3029E65121CE}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {E7943063-5DB9-4EC6-86DD-3029E65121CE}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {E7943063-5DB9-4EC6-86DD-3029E65121CE}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {E7943063-5DB9-4EC6-86DD-3029E65121CE}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {59E9B218-81D0-4A80-A4B7-66C716136D82}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {59E9B218-81D0-4A80-A4B7-66C716136D82}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {59E9B218-81D0-4A80-A4B7-66C716136D82}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {59E9B218-81D0-4A80-A4B7-66C716136D82}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {551A6340-8EEF-445E-A2A2-639CC23DBD36}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {551A6340-8EEF-445E-A2A2-639CC23DBD36}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {551A6340-8EEF-445E-A2A2-639CC23DBD36}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {551A6340-8EEF-445E-A2A2-639CC23DBD36}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {E7943063-5DB9-4EC6-86DD-3029E65121CE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {E7943063-5DB9-4EC6-86DD-3029E65121CE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {E7943063-5DB9-4EC6-86DD-3029E65121CE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {E7943063-5DB9-4EC6-86DD-3029E65121CE}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/ref/Configurations.props b/src/libraries/System.ComponentModel.EventBasedAsync/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ComponentModel.EventBasedAsync/ref/Configurations.props
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj b/src/libraries/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj
index 6a82f1e..f324fc5 100644 (file)
--- a/src/libraries/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ComponentModel.EventBasedAsync.cs" />

diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/src/Configurations.props b/src/libraries/System.ComponentModel.EventBasedAsync/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ComponentModel.EventBasedAsync/src/Configurations.props
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj b/src/libraries/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj
index 0faacb2..4c6a483 100644 (file)
--- a/src/libraries/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <RootNamespace>System.ComponentModel.EventBasedAsync</RootNamespace>
     <AssemblyName>System.ComponentModel.EventBasedAsync</AssemblyName>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\ComponentModel\AsyncCompletedEvent.cs" />

diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/tests/Configurations.props b/src/libraries/System.ComponentModel.EventBasedAsync/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ComponentModel.EventBasedAsync/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj b/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj
index 2c5fce3..39dd7da 100644 (file)
--- a/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AsyncOperationManagerTests.cs" />

diff --git a/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln b/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
index 0bbb97c..404c31e 100644 (file)
--- a/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
+++ b/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {F620F382-30D1-451E-B125-2A612F92068B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F620F382-30D1-451E-B125-2A612F92068B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F620F382-30D1-451E-B125-2A612F92068B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F620F382-30D1-451E-B125-2A612F92068B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {ECF37FA5-BEB7-4A23-A573-693B343B45C3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {ECF37FA5-BEB7-4A23-A573-693B343B45C3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {ECF37FA5-BEB7-4A23-A573-693B343B45C3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {ECF37FA5-BEB7-4A23-A573-693B343B45C3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {F620F382-30D1-451E-B125-2A612F92068B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F620F382-30D1-451E-B125-2A612F92068B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F620F382-30D1-451E-B125-2A612F92068B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F620F382-30D1-451E-B125-2A612F92068B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {ECF37FA5-BEB7-4A23-A573-693B343B45C3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {ECF37FA5-BEB7-4A23-A573-693B343B45C3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {ECF37FA5-BEB7-4A23-A573-693B343B45C3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {ECF37FA5-BEB7-4A23-A573-693B343B45C3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.ComponentModel.Primitives/ref/Configurations.props b/src/libraries/System.ComponentModel.Primitives/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ComponentModel.Primitives/ref/Configurations.props
+++ b/src/libraries/System.ComponentModel.Primitives/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj b/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj
index d25ef11..5d5a623 100644 (file)
--- a/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj
+++ b/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.ComponentModel.Primitives/src/Configurations.props b/src/libraries/System.ComponentModel.Primitives/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ComponentModel.Primitives/src/Configurations.props
+++ b/src/libraries/System.ComponentModel.Primitives/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj b/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj
index 3d68cde..ee162e6 100644 (file)
--- a/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj
+++ b/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>System.ComponentModel.Primitives</RootNamespace>
     <AssemblyName>System.ComponentModel.Primitives</AssemblyName>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.ComponentModel.Primitives/tests/Configurations.props b/src/libraries/System.ComponentModel.Primitives/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ComponentModel.Primitives/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel.Primitives/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj b/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
index 1c45301..3451030 100644 (file)
--- a/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
+++ b/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\ComponentModel\BrowsableAttributeTests.cs" />

diff --git a/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln b/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
index fdb868b..4bafb9a 100644 (file)
--- a/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
+++ b/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {D35FD24C-1D1E-4860-B44D-73097CC0BD90}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D35FD24C-1D1E-4860-B44D-73097CC0BD90}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D35FD24C-1D1E-4860-B44D-73097CC0BD90}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D35FD24C-1D1E-4860-B44D-73097CC0BD90}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {D35FD24C-1D1E-4860-B44D-73097CC0BD90}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D35FD24C-1D1E-4860-B44D-73097CC0BD90}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D35FD24C-1D1E-4860-B44D-73097CC0BD90}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D35FD24C-1D1E-4860-B44D-73097CC0BD90}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.ComponentModel.TypeConverter/ref/Configurations.props b/src/libraries/System.ComponentModel.TypeConverter/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ComponentModel.TypeConverter/ref/Configurations.props
+++ b/src/libraries/System.ComponentModel.TypeConverter/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj
index 117bdb9..ffe9dc5 100644 (file)
--- a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ComponentModel.manual.cs" />

diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/Configurations.props b/src/libraries/System.ComponentModel.TypeConverter/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ComponentModel.TypeConverter/src/Configurations.props
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
index 40f1406..c8051d2 100644 (file)
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>System.ComponentModel.TypeConverter</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="MS\Internal\Xml\Linq\ComponentModel\XComponentModel.cs" />

diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/Configurations.props b/src/libraries/System.ComponentModel.TypeConverter/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ComponentModel.TypeConverter/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel.TypeConverter/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
index 528e6fc..bc6b773 100644 (file)
--- a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
@@ -4,7 +4,7 @@
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <RootNamespace />
     <AssemblyVersion>9.9.9.9</AssemblyVersion>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="Drawing\ColorConverterTests.cs" />

diff --git a/src/libraries/System.ComponentModel/System.ComponentModel.sln b/src/libraries/System.ComponentModel/System.ComponentModel.sln
index b2d5a09..f6ddbf6 100644 (file)
--- a/src/libraries/System.ComponentModel/System.ComponentModel.sln
+++ b/src/libraries/System.ComponentModel/System.ComponentModel.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.ComponentModel/ref/Configurations.props b/src/libraries/System.ComponentModel/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ComponentModel/ref/Configurations.props
+++ b/src/libraries/System.ComponentModel/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel/ref/System.ComponentModel.csproj b/src/libraries/System.ComponentModel/ref/System.ComponentModel.csproj
index 94a559f..ccb7d78 100644 (file)
--- a/src/libraries/System.ComponentModel/ref/System.ComponentModel.csproj
+++ b/src/libraries/System.ComponentModel/ref/System.ComponentModel.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.ComponentModel/src/Configurations.props b/src/libraries/System.ComponentModel/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ComponentModel/src/Configurations.props
+++ b/src/libraries/System.ComponentModel/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj b/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj
index 91315fd..3062041 100644 (file)
--- a/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj
+++ b/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj
@@ -3,7 +3,7 @@
     <RootNamespace>System.ComponentModel</RootNamespace>
     <AssemblyName>System.ComponentModel</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.ComponentModel/tests/Configurations.props b/src/libraries/System.ComponentModel/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ComponentModel/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.csproj b/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.csproj
index 1878153..d707f04 100644 (file)
--- a/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.csproj
+++ b/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CancelEventArgsTests.cs" />

diff --git a/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln b/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
index a21e913..5337520 100644 (file)
--- a/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
+++ b/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
@@ -19,10 +19,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {C6257381-C624-494A-A9D9-5586E60856EA}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {C6257381-C624-494A-A9D9-5586E60856EA}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {C6257381-C624-494A-A9D9-5586E60856EA}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Composition.AttributedModel/tests/Configurations.props b/src/libraries/System.Composition.AttributedModel/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Composition.AttributedModel/tests/Configurations.props
+++ b/src/libraries/System.Composition.AttributedModel/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Composition.AttributedModel/tests/System.Composition.AttributeModel.Tests.csproj b/src/libraries/System.Composition.AttributedModel/tests/System.Composition.AttributeModel.Tests.csproj
index 6ba40eb..fba0fa2 100644 (file)
--- a/src/libraries/System.Composition.AttributedModel/tests/System.Composition.AttributeModel.Tests.csproj
+++ b/src/libraries/System.Composition.AttributedModel/tests/System.Composition.AttributeModel.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SharingBoundaryAttributeTests.cs" />

diff --git a/src/libraries/System.Composition.Convention/System.Composition.Convention.sln b/src/libraries/System.Composition.Convention/System.Composition.Convention.sln
index a3a2e09..0469742 100644 (file)
--- a/src/libraries/System.Composition.Convention/System.Composition.Convention.sln
+++ b/src/libraries/System.Composition.Convention/System.Composition.Convention.sln
@@ -19,10 +19,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {E6592FAD-10B5-4B56-9287-D72DD136992F}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {E6592FAD-10B5-4B56-9287-D72DD136992F}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {E6592FAD-10B5-4B56-9287-D72DD136992F}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Composition.Convention/tests/Configurations.props b/src/libraries/System.Composition.Convention/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Composition.Convention/tests/Configurations.props
+++ b/src/libraries/System.Composition.Convention/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj b/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
index 77f14be..a100e22 100644 (file)
--- a/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
+++ b/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>System.Composition.Convention.Tests</AssemblyName>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AttributedModelConventionExtensions.cs" />

diff --git a/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln b/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln
index cac2e95..cbb90d8 100644 (file)
--- a/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln
+++ b/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln
@@ -19,10 +19,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {52BE9F68-69EC-44AA-806E-11EFB57D9B4B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {52BE9F68-69EC-44AA-806E-11EFB57D9B4B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {52BE9F68-69EC-44AA-806E-11EFB57D9B4B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {52BE9F68-69EC-44AA-806E-11EFB57D9B4B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {52BE9F68-69EC-44AA-806E-11EFB57D9B4B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {52BE9F68-69EC-44AA-806E-11EFB57D9B4B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {52BE9F68-69EC-44AA-806E-11EFB57D9B4B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {52BE9F68-69EC-44AA-806E-11EFB57D9B4B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Composition.Hosting/tests/Configurations.props b/src/libraries/System.Composition.Hosting/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Composition.Hosting/tests/Configurations.props
+++ b/src/libraries/System.Composition.Hosting/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Composition.Hosting/tests/System.Composition.Hosting.Tests.csproj b/src/libraries/System.Composition.Hosting/tests/System.Composition.Hosting.Tests.csproj
index 9ee5dd1..0223b49 100644 (file)
--- a/src/libraries/System.Composition.Hosting/tests/System.Composition.Hosting.Tests.csproj
+++ b/src/libraries/System.Composition.Hosting/tests/System.Composition.Hosting.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Composition\Hosting\Core\CompositionDependencyTests.cs" />

diff --git a/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln b/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln
index de735fd..167a473 100644 (file)
--- a/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln
+++ b/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln
@@ -19,10 +19,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {3B6042E6-9765-4A03-9089-92050100C85E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {3B6042E6-9765-4A03-9089-92050100C85E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {3B6042E6-9765-4A03-9089-92050100C85E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {3B6042E6-9765-4A03-9089-92050100C85E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {3B6042E6-9765-4A03-9089-92050100C85E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {3B6042E6-9765-4A03-9089-92050100C85E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {3B6042E6-9765-4A03-9089-92050100C85E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {3B6042E6-9765-4A03-9089-92050100C85E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {2711DFD2-8541-4628-BC53-EB784A14CDCF}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {2711DFD2-8541-4628-BC53-EB784A14CDCF}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {2711DFD2-8541-4628-BC53-EB784A14CDCF}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Composition.Runtime/tests/Configurations.props b/src/libraries/System.Composition.Runtime/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Composition.Runtime/tests/Configurations.props
+++ b/src/libraries/System.Composition.Runtime/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Composition.Runtime/tests/System.Composition.Runtime.Tests.csproj b/src/libraries/System.Composition.Runtime/tests/System.Composition.Runtime.Tests.csproj
index 5aa5025..383eed4 100644 (file)
--- a/src/libraries/System.Composition.Runtime/tests/System.Composition.Runtime.Tests.csproj
+++ b/src/libraries/System.Composition.Runtime/tests/System.Composition.Runtime.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Composition\Hosting\Core\CompositionContractTests.cs" />

diff --git a/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln b/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln
index f8b6e6a..c57ae5c 100644 (file)
--- a/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln
+++ b/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln
@@ -19,10 +19,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {8D1CB149-B52E-472B-A91F-DF1C77D8BA46}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {8D1CB149-B52E-472B-A91F-DF1C77D8BA46}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {8D1CB149-B52E-472B-A91F-DF1C77D8BA46}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {8D1CB149-B52E-472B-A91F-DF1C77D8BA46}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {8D1CB149-B52E-472B-A91F-DF1C77D8BA46}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {8D1CB149-B52E-472B-A91F-DF1C77D8BA46}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {8D1CB149-B52E-472B-A91F-DF1C77D8BA46}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {8D1CB149-B52E-472B-A91F-DF1C77D8BA46}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Composition.TypedParts/tests/Configurations.props b/src/libraries/System.Composition.TypedParts/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Composition.TypedParts/tests/Configurations.props
+++ b/src/libraries/System.Composition.TypedParts/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj b/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj
index 62f54c3..efa5d48 100644 (file)
--- a/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj
+++ b/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ContainerConfigurationTests.cs" />

diff --git a/src/libraries/System.Composition/System.Composition.sln b/src/libraries/System.Composition/System.Composition.sln
index 551252f..e6ffbae 100644 (file)
--- a/src/libraries/System.Composition/System.Composition.sln
+++ b/src/libraries/System.Composition/System.Composition.sln
@@ -16,10 +16,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {44C7E52C-3873-4C64-875C-8A23A8376D60}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {44C7E52C-3873-4C64-875C-8A23A8376D60}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {44C7E52C-3873-4C64-875C-8A23A8376D60}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Composition/tests/Configurations.props b/src/libraries/System.Composition/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Composition/tests/Configurations.props
+++ b/src/libraries/System.Composition/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Composition/tests/System.Composition.Tests.csproj b/src/libraries/System.Composition/tests/System.Composition.Tests.csproj
index b8f9c7c..85b172f 100644 (file)
--- a/src/libraries/System.Composition/tests/System.Composition.Tests.csproj
+++ b/src/libraries/System.Composition/tests/System.Composition.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>System.Composition.Lightweight.UnitTests</RootNamespace>
     <AssemblyName>System.Composition.Tests</AssemblyName>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ActivationEventOrderingTests.cs" />

diff --git a/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln b/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
index 84ebd76..ee6b65a 100644 (file)
--- a/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
+++ b/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {7669C397-C21C-4C08-83F1-BE6691911E88}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7669C397-C21C-4C08-83F1-BE6691911E88}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7669C397-C21C-4C08-83F1-BE6691911E88}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7669C397-C21C-4C08-83F1-BE6691911E88}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {7669C397-C21C-4C08-83F1-BE6691911E88}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7669C397-C21C-4C08-83F1-BE6691911E88}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7669C397-C21C-4C08-83F1-BE6691911E88}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7669C397-C21C-4C08-83F1-BE6691911E88}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {B7697463-7C98-4462-BA09-67B7BF3842B6}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {B7697463-7C98-4462-BA09-67B7BF3842B6}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {B7697463-7C98-4462-BA09-67B7BF3842B6}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/Configurations.props b/src/libraries/System.Configuration.ConfigurationManager/ref/Configurations.props
index b4925fb..0dac4d7 100644 (file)
--- a/src/libraries/System.Configuration.ConfigurationManager/ref/Configurations.props
+++ b/src/libraries/System.Configuration.ConfigurationManager/ref/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
index 4ad85e4..39ae1bb 100644 (file)
--- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Configuration.ConfigurationManager.cs" />

diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/Configurations.props b/src/libraries/System.Configuration.ConfigurationManager/src/Configurations.props
index 9ec640e..8480779 100644 (file)
--- a/src/libraries/System.Configuration.ConfigurationManager/src/Configurations.props
+++ b/src/libraries/System.Configuration.ConfigurationManager/src/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
index 48b30e9..7acf1a9 100644 (file)
--- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
     <Compile Include="System\Configuration\DictionarySectionHandler.cs" />

diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/Configurations.props b/src/libraries/System.Configuration.ConfigurationManager/tests/Configurations.props
index 4eaa8e6..61dd6d5 100644 (file)
--- a/src/libraries/System.Configuration.ConfigurationManager/tests/Configurations.props
+++ b/src/libraries/System.Configuration.ConfigurationManager/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj
index f0efd58..d3560c9 100644 (file)
--- a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj
@@ -4,7 +4,7 @@
     <TestDisableAppDomain>true</TestDisableAppDomain>
     <TestDisableParallelization>true</TestDisableParallelization>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs">

diff --git a/src/libraries/System.Console/System.Console.sln b/src/libraries/System.Console/System.Console.sln
index bb1d6dc..272951d 100644 (file)
--- a/src/libraries/System.Console/System.Console.sln
+++ b/src/libraries/System.Console/System.Console.sln
@@ -31,22 +31,22 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {99E5069D-241F-48A6-8F29-404B4AED72BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {99E5069D-241F-48A6-8F29-404B4AED72BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {99E5069D-241F-48A6-8F29-404B4AED72BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {99E5069D-241F-48A6-8F29-404B4AED72BF}.Release|Any CPU.Build.0 = Release|Any CPU
-               {F9DF2357-81B4-4317-908E-512DA9395583}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {F9DF2357-81B4-4317-908E-512DA9395583}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {F9DF2357-81B4-4317-908E-512DA9395583}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {F9DF2357-81B4-4317-908E-512DA9395583}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {9EB75B87-2BE5-48E5-8988-A0929CE6664E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {9EB75B87-2BE5-48E5-8988-A0929CE6664E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {9EB75B87-2BE5-48E5-8988-A0929CE6664E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {9EB75B87-2BE5-48E5-8988-A0929CE6664E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {F9DF2357-81B4-4317-908E-512DA9395583}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F9DF2357-81B4-4317-908E-512DA9395583}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F9DF2357-81B4-4317-908E-512DA9395583}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F9DF2357-81B4-4317-908E-512DA9395583}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {9EB75B87-2BE5-48E5-8988-A0929CE6664E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {9EB75B87-2BE5-48E5-8988-A0929CE6664E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {9EB75B87-2BE5-48E5-8988-A0929CE6664E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {9EB75B87-2BE5-48E5-8988-A0929CE6664E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Console/ref/Configurations.props b/src/libraries/System.Console/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Console/ref/Configurations.props
+++ b/src/libraries/System.Console/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Console/ref/System.Console.csproj b/src/libraries/System.Console/ref/System.Console.csproj
index 84284f0..cf496de 100644 (file)
--- a/src/libraries/System.Console/ref/System.Console.csproj
+++ b/src/libraries/System.Console/ref/System.Console.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Console/src/Configurations.props b/src/libraries/System.Console/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.Console/src/Configurations.props
+++ b/src/libraries/System.Console/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Console/src/System.Console.csproj b/src/libraries/System.Console/src/System.Console.csproj
index bff20b2..c539c59 100644 (file)
--- a/src/libraries/System.Console/src/System.Console.csproj
+++ b/src/libraries/System.Console/src/System.Console.csproj
@@ -3,7 +3,7 @@
     <RootNamespace>System.Console</RootNamespace>
     <AssemblyName>System.Console</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Console/tests/Configurations.props b/src/libraries/System.Console/tests/Configurations.props
index 2076da5..4614c37 100644 (file)
--- a/src/libraries/System.Console/tests/Configurations.props
+++ b/src/libraries/System.Console/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent);
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/libraries/System.Console/tests/System.Console.Tests.csproj
index e576e0b..07b9edd 100644 (file)
--- a/src/libraries/System.Console/tests/System.Console.Tests.csproj
+++ b/src/libraries/System.Console/tests/System.Console.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CancelKeyPress.cs" />

diff --git a/src/libraries/System.Data.Common/System.Data.Common.sln b/src/libraries/System.Data.Common/System.Data.Common.sln
index a6a1c30..c85dfbd 100644 (file)
--- a/src/libraries/System.Data.Common/System.Data.Common.sln
+++ b/src/libraries/System.Data.Common/System.Data.Common.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {B473F77D-4168-4123-932A-E88020B768FA}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B473F77D-4168-4123-932A-E88020B768FA}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B473F77D-4168-4123-932A-E88020B768FA}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B473F77D-4168-4123-932A-E88020B768FA}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {29EF8D53-8E84-4E49-B90F-5950A2FE7D54}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {29EF8D53-8E84-4E49-B90F-5950A2FE7D54}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {29EF8D53-8E84-4E49-B90F-5950A2FE7D54}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {29EF8D53-8E84-4E49-B90F-5950A2FE7D54}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {D2DB0D6F-F65E-4174-B31E-27DC03137118}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D2DB0D6F-F65E-4174-B31E-27DC03137118}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D2DB0D6F-F65E-4174-B31E-27DC03137118}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D2DB0D6F-F65E-4174-B31E-27DC03137118}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {B473F77D-4168-4123-932A-E88020B768FA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B473F77D-4168-4123-932A-E88020B768FA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B473F77D-4168-4123-932A-E88020B768FA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B473F77D-4168-4123-932A-E88020B768FA}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {29EF8D53-8E84-4E49-B90F-5950A2FE7D54}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {29EF8D53-8E84-4E49-B90F-5950A2FE7D54}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {29EF8D53-8E84-4E49-B90F-5950A2FE7D54}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {29EF8D53-8E84-4E49-B90F-5950A2FE7D54}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {D2DB0D6F-F65E-4174-B31E-27DC03137118}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D2DB0D6F-F65E-4174-B31E-27DC03137118}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D2DB0D6F-F65E-4174-B31E-27DC03137118}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D2DB0D6F-F65E-4174-B31E-27DC03137118}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Data.Common/ref/Configurations.props b/src/libraries/System.Data.Common/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Data.Common/ref/Configurations.props
+++ b/src/libraries/System.Data.Common/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.Common/ref/System.Data.Common.csproj b/src/libraries/System.Data.Common/ref/System.Data.Common.csproj
index c50b085..09f3d8b 100644 (file)
--- a/src/libraries/System.Data.Common/ref/System.Data.Common.csproj
+++ b/src/libraries/System.Data.Common/ref/System.Data.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NoWarn>$(NoWarn);0618</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Data.Common.cs" />

diff --git a/src/libraries/System.Data.Common/src/Configurations.props b/src/libraries/System.Data.Common/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Data.Common/src/Configurations.props
+++ b/src/libraries/System.Data.Common/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.Common/src/System.Data.Common.csproj b/src/libraries/System.Data.Common/src/System.Data.Common.csproj
index 418b062..ae8deb1 100644 (file)
--- a/src/libraries/System.Data.Common/src/System.Data.Common.csproj
+++ b/src/libraries/System.Data.Common/src/System.Data.Common.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573</NoWarn>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Data.Common.TypeForwards.cs" />

diff --git a/src/libraries/System.Data.Common/tests/Configurations.props b/src/libraries/System.Data.Common/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Data.Common/tests/Configurations.props
+++ b/src/libraries/System.Data.Common/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
index 77548d0..ada40ba 100644 (file)
--- a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
+++ b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <NoWarn>0168,0169,0414,0219,0649</NoWarn>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Data\Common\DataColumnMappingTest.cs" />

diff --git a/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln b/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln
index 9ed643e..04e4b23 100644 (file)
--- a/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln
+++ b/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {2B38992F-9979-485F-B104-38C476D0B706}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2B38992F-9979-485F-B104-38C476D0B706}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2B38992F-9979-485F-B104-38C476D0B706}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2B38992F-9979-485F-B104-38C476D0B706}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {50D18478-BE75-4F54-8080-A5C3047D776B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {50D18478-BE75-4F54-8080-A5C3047D776B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {50D18478-BE75-4F54-8080-A5C3047D776B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {50D18478-BE75-4F54-8080-A5C3047D776B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {50A5A8BC-C6A9-4000-8B52-667BEE00459D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {50A5A8BC-C6A9-4000-8B52-667BEE00459D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {50A5A8BC-C6A9-4000-8B52-667BEE00459D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {50A5A8BC-C6A9-4000-8B52-667BEE00459D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {2B38992F-9979-485F-B104-38C476D0B706}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2B38992F-9979-485F-B104-38C476D0B706}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2B38992F-9979-485F-B104-38C476D0B706}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2B38992F-9979-485F-B104-38C476D0B706}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {50D18478-BE75-4F54-8080-A5C3047D776B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {50D18478-BE75-4F54-8080-A5C3047D776B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {50D18478-BE75-4F54-8080-A5C3047D776B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {50D18478-BE75-4F54-8080-A5C3047D776B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {50A5A8BC-C6A9-4000-8B52-667BEE00459D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {50A5A8BC-C6A9-4000-8B52-667BEE00459D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {50A5A8BC-C6A9-4000-8B52-667BEE00459D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {50A5A8BC-C6A9-4000-8B52-667BEE00459D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Data.DataSetExtensions/ref/Configurations.props b/src/libraries/System.Data.DataSetExtensions/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Data.DataSetExtensions/ref/Configurations.props
+++ b/src/libraries/System.Data.DataSetExtensions/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.csproj b/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.csproj
index 9c1d0f7..2cd636b 100644 (file)
--- a/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.csproj
+++ b/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Data.DataSetExtensions.Forwards.cs" />

diff --git a/src/libraries/System.Data.DataSetExtensions/src/Configurations.props b/src/libraries/System.Data.DataSetExtensions/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Data.DataSetExtensions/src/Configurations.props
+++ b/src/libraries/System.Data.DataSetExtensions/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.DataSetExtensions/src/System.Data.DataSetExtensions.csproj b/src/libraries/System.Data.DataSetExtensions/src/System.Data.DataSetExtensions.csproj
index 88a7749..5271a90 100644 (file)
--- a/src/libraries/System.Data.DataSetExtensions/src/System.Data.DataSetExtensions.csproj
+++ b/src/libraries/System.Data.DataSetExtensions/src/System.Data.DataSetExtensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>System.Data.DataSetExtensions</AssemblyName>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/libraries/System.Data.DataSetExtensions/tests/Configurations.props b/src/libraries/System.Data.DataSetExtensions/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Data.DataSetExtensions/tests/Configurations.props
+++ b/src/libraries/System.Data.DataSetExtensions/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.DataSetExtensions/tests/System.Data.DataSetExtensions.Tests.csproj b/src/libraries/System.Data.DataSetExtensions/tests/System.Data.DataSetExtensions.Tests.csproj
index b8013d0..ab9920f 100644 (file)
--- a/src/libraries/System.Data.DataSetExtensions/tests/System.Data.DataSetExtensions.Tests.csproj
+++ b/src/libraries/System.Data.DataSetExtensions/tests/System.Data.DataSetExtensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Mono\DataRowComparerTest.cs" />

diff --git a/src/libraries/System.Data.Odbc/System.Data.Odbc.sln b/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
index 33ee95d..3212fdb 100644 (file)
--- a/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
+++ b/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {F3E72F35-0351-4D67-2209-725BCAD807BA}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {F3E72F35-0351-4D67-2209-725BCAD807BA}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {F3E72F35-0351-4D67-2209-725BCAD807BA}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {F3E72F35-0351-4D67-2209-725BCAD807BA}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {7BAD100F-AD6B-490A-AF7C-8E3854E812C0}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {7BAD100F-AD6B-490A-AF7C-8E3854E812C0}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {7BAD100F-AD6B-490A-AF7C-8E3854E812C0}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {7BAD100F-AD6B-490A-AF7C-8E3854E812C0}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {F3E72F35-0351-4D67-2209-725BCAD807BA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F3E72F35-0351-4D67-2209-725BCAD807BA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F3E72F35-0351-4D67-2209-725BCAD807BA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F3E72F35-0351-4D67-2209-725BCAD807BA}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {7BAD100F-AD6B-490A-AF7C-8E3854E812C0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7BAD100F-AD6B-490A-AF7C-8E3854E812C0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7BAD100F-AD6B-490A-AF7C-8E3854E812C0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {7BAD100F-AD6B-490A-AF7C-8E3854E812C0}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {D589374B-3331-4660-8DFB-512D66F8EC63}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {D589374B-3331-4660-8DFB-512D66F8EC63}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {D589374B-3331-4660-8DFB-512D66F8EC63}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Data.Odbc/ref/Configurations.props b/src/libraries/System.Data.Odbc/ref/Configurations.props
index e34056e..b4029b3 100644 (file)
--- a/src/libraries/System.Data.Odbc/ref/Configurations.props
+++ b/src/libraries/System.Data.Odbc/ref/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      netfx;
+      $(NetFrameworkCurrent);
       net461;
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj
index 901ffa5..5c4a834 100644 (file)
--- a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj
+++ b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Data.Odbc.cs" />

diff --git a/src/libraries/System.Data.Odbc/src/Configurations.props b/src/libraries/System.Data.Odbc/src/Configurations.props
index 27e8e5b..f61ae46 100644 (file)
--- a/src/libraries/System.Data.Odbc/src/Configurations.props
+++ b/src/libraries/System.Data.Odbc/src/Configurations.props
@@ -10,11 +10,11 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netcoreapp-FreeBSD;
-      netcoreapp-Linux;
-      netcoreapp-OSX;
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-FreeBSD;
+      $(NetCoreAppCurrent)-Linux;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Data.Odbc/src/MatchingRefApiCompatBaseline.txt b/src/libraries/System.Data.Odbc/src/MatchingRefApiCompatBaseline.txt
index 9bc9bf0..804d1cc 100644 (file)
--- a/src/libraries/System.Data.Odbc/src/MatchingRefApiCompatBaseline.txt
+++ b/src/libraries/System.Data.Odbc/src/MatchingRefApiCompatBaseline.txt
@@ -1,6 +1,6 @@
 # Exposed publicly only in implementation for serialization compat
 TypesMustExist : Type 'System.Data.Odbc.ODBC32' does not exist in the reference but it does exist in the implementation.
 
-# Cannot be exposed in the ref yet as it is new API that doesn't exist in netfx
+# Cannot be exposed in the ref yet as it is new API that doesn't exist in net472
 MembersMustExist : Member 'System.Data.Odbc.OdbcParameter.Offset.get()' does not exist in the reference but it does exist in the implementation.
 MembersMustExist : Member 'System.Data.Odbc.OdbcParameter.Offset.set(System.Int32)' does not exist in the reference but it does exist in the implementation.

diff --git a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
index b45ea69..9113a4e 100644 (file)
--- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
+++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.Odbc_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-FreeBSD-Debug;netcoreapp-FreeBSD-Release;netcoreapp-Linux-Debug;netcoreapp-Linux-Release;netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-FreeBSD-Debug;netcoreapp2.0-FreeBSD-Release;netcoreapp2.0-Linux-Debug;netcoreapp2.0-Linux-Release;netcoreapp2.0-OSX-Debug;netcoreapp2.0-OSX-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetCoreAppCurrent)-FreeBSD-Debug;$(NetCoreAppCurrent)-FreeBSD-Release;$(NetCoreAppCurrent)-Linux-Debug;$(NetCoreAppCurrent)-Linux-Release;$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp2.0-FreeBSD-Debug;netcoreapp2.0-FreeBSD-Release;netcoreapp2.0-Linux-Debug;netcoreapp2.0-Linux-Release;netcoreapp2.0-OSX-Debug;netcoreapp2.0-OSX-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="$(CommonPath)System\Data\Common\AdapterUtil.cs">

diff --git a/src/libraries/System.Data.Odbc/tests/Configurations.props b/src/libraries/System.Data.Odbc/tests/Configurations.props
index 88f254c..7bcf574 100644 (file)
--- a/src/libraries/System.Data.Odbc/tests/Configurations.props
+++ b/src/libraries/System.Data.Odbc/tests/Configurations.props
@@ -1,11 +1,11 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-FreeBSD;
-      netcoreapp-Linux;
-      netcoreapp-OSX;
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-FreeBSD;
+      $(NetCoreAppCurrent)-Linux;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj b/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj
index 9b4e580..9d5b6af 100644 (file)
--- a/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj
+++ b/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants Condition="'$(TargetsWindows)' == 'true'">$(DefineConstants);TargetsWindows</DefineConstants>
-    <Configurations>netcoreapp-FreeBSD-Debug;netcoreapp-FreeBSD-Release;netcoreapp-Linux-Debug;netcoreapp-Linux-Release;netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-FreeBSD-Debug;$(NetCoreAppCurrent)-FreeBSD-Release;$(NetCoreAppCurrent)-Linux-Debug;$(NetCoreAppCurrent)-Linux-Release;$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DependencyCheckTest.cs" />

diff --git a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
index 61636b6..93dbde5 100644 (file)
--- a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
+++ b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {73C7A14F-C3C5-44EA-AB02-05BFBA55722C}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {73C7A14F-C3C5-44EA-AB02-05BFBA55722C}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {73C7A14F-C3C5-44EA-AB02-05BFBA55722C}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {73C7A14F-C3C5-44EA-AB02-05BFBA55722C}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {73C7A14F-C3C5-44EA-AB02-05BFBA55722C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {73C7A14F-C3C5-44EA-AB02-05BFBA55722C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {73C7A14F-C3C5-44EA-AB02-05BFBA55722C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {73C7A14F-C3C5-44EA-AB02-05BFBA55722C}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {D909B69D-8F3B-4551-A355-8FFF6A308CF6}.Debug|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Debug|Any CPU
                {D909B69D-8F3B-4551-A355-8FFF6A308CF6}.Debug|Any CPU.Build.0 = netstandard2.0-Windows_NT-Debug|Any CPU
                {D909B69D-8F3B-4551-A355-8FFF6A308CF6}.Release|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Release|Any CPU

diff --git a/src/libraries/System.Data.OleDb/ref/Configurations.props b/src/libraries/System.Data.OleDb/ref/Configurations.props
index 23a6cc8..66ac058 100644 (file)
--- a/src/libraries/System.Data.OleDb/ref/Configurations.props
+++ b/src/libraries/System.Data.OleDb/ref/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj
index 18ac77b..98d4b35 100644 (file)
--- a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj
+++ b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
     <NoWarn>$(NoWarn);0618</NoWarn>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Data.OleDb/src/Configurations.props b/src/libraries/System.Data.OleDb/src/Configurations.props
index 3751609..a37ba68 100644 (file)
--- a/src/libraries/System.Data.OleDb/src/Configurations.props
+++ b/src/libraries/System.Data.OleDb/src/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
index 3c740bc..55b8fda 100644 (file)
--- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
+++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
@@ -5,7 +5,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS' and '$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_OleDb</GeneratePlatformNotSupportedAssemblyMessage>
     <NoWarn Condition="'$(OSGroup)' == 'AnyOS' and '$(TargetsNetStandard)' == 'true'">$(NoWarn);CS0618</NoWarn>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true' and '$(TargetsWindows)' == 'true'">

diff --git a/src/libraries/System.Data.OleDb/tests/Configurations.props b/src/libraries/System.Data.OleDb/tests/Configurations.props
index d2b1d4d..d4f4961 100644 (file)
--- a/src/libraries/System.Data.OleDb/tests/Configurations.props
+++ b/src/libraries/System.Data.OleDb/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj b/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj
index c74531c..5dfec3f 100644 (file)
--- a/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj
+++ b/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Helpers.cs" />

diff --git a/src/libraries/System.Data.SqlClient/System.Data.SqlClient.sln b/src/libraries/System.Data.SqlClient/System.Data.SqlClient.sln
index 54e999d..3d40295 100644 (file)
--- a/src/libraries/System.Data.SqlClient/System.Data.SqlClient.sln
+++ b/src/libraries/System.Data.SqlClient/System.Data.SqlClient.sln
@@ -86,10 +86,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
@@ -106,26 +106,26 @@ Global
                {E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
                {E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|Any CPU.Build.0 = netstandard2.0-Release|Any CPU
-               {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {AF78BA88-6428-47EA-8682-442DAF8E9656}.Debug|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Debug|Any CPU
                {AF78BA88-6428-47EA-8682-442DAF8E9656}.Debug|Any CPU.Build.0 = netstandard2.0-Windows_NT-Debug|Any CPU
                {AF78BA88-6428-47EA-8682-442DAF8E9656}.Release|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Release|Any CPU
                {AF78BA88-6428-47EA-8682-442DAF8E9656}.Release|Any CPU.Build.0 = netstandard2.0-Windows_NT-Release|Any CPU
-               {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {518A4E22-0144-4699-80AE-757B744E8E38}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {518A4E22-0144-4699-80AE-757B744E8E38}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {518A4E22-0144-4699-80AE-757B744E8E38}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {518A4E22-0144-4699-80AE-757B744E8E38}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {518A4E22-0144-4699-80AE-757B744E8E38}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {518A4E22-0144-4699-80AE-757B744E8E38}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {518A4E22-0144-4699-80AE-757B744E8E38}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {518A4E22-0144-4699-80AE-757B744E8E38}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Debug|Any CPU
                {1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|Any CPU.Build.0 = netstandard2.0-Windows_NT-Debug|Any CPU
                {1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Release|Any CPU
@@ -138,14 +138,14 @@ Global
                {8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|Any CPU.Build.0 = netstandard2.0-Windows_NT-Debug|Any CPU
                {8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Release|Any CPU
                {8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|Any CPU.Build.0 = netstandard2.0-Windows_NT-Release|Any CPU
-               {D4550556-4745-457F-BA8F-3EBF3836D6B4}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {D4550556-4745-457F-BA8F-3EBF3836D6B4}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {D4550556-4745-457F-BA8F-3EBF3836D6B4}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {D4550556-4745-457F-BA8F-3EBF3836D6B4}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {D58E8D2B-3331-4660-8DFB-512D66F8EC63}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D58E8D2B-3331-4660-8DFB-512D66F8EC63}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D58E8D2B-3331-4660-8DFB-512D66F8EC63}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D58E8D2B-3331-4660-8DFB-512D66F8EC63}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {D4550556-4745-457F-BA8F-3EBF3836D6B4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D4550556-4745-457F-BA8F-3EBF3836D6B4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D4550556-4745-457F-BA8F-3EBF3836D6B4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D4550556-4745-457F-BA8F-3EBF3836D6B4}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D58E8D2B-3331-4660-8DFB-512D66F8EC63}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D58E8D2B-3331-4660-8DFB-512D66F8EC63}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D58E8D2B-3331-4660-8DFB-512D66F8EC63}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D58E8D2B-3331-4660-8DFB-512D66F8EC63}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Data.SqlClient/ref/Configurations.props b/src/libraries/System.Data.SqlClient/ref/Configurations.props
index 67f6653..96cab88 100644 (file)
--- a/src/libraries/System.Data.SqlClient/ref/Configurations.props
+++ b/src/libraries/System.Data.SqlClient/ref/Configurations.props
@@ -5,7 +5,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj b/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
index 3d9a54f..614bae7 100644 (file)
--- a/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
+++ b/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Data.SqlClient.cs" />
@@ -18,7 +18,7 @@
     <Reference Include="System.Xml.ReaderWriter" />
     <Reference Include="System.Runtime.InteropServices" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" />
     <ProjectReference Include="..\..\System.Data.Common\ref\System.Data.Common.csproj" />

diff --git a/src/libraries/System.Data.SqlClient/src/Configurations.props b/src/libraries/System.Data.SqlClient/src/Configurations.props
index c1bd342..3e86819 100644 (file)
--- a/src/libraries/System.Data.SqlClient/src/Configurations.props
+++ b/src/libraries/System.Data.SqlClient/src/Configurations.props
@@ -9,10 +9,10 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netcoreapp;
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
-      _netfx-Windows_NT;
+      $(NetCoreAppCurrent);
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      _$(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
index 235adc3..d525343 100644 (file)
--- a/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
+++ b/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
@@ -6,10 +6,10 @@
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS'">SR.PlatformNotSupported_DataSqlClient</GeneratePlatformNotSupportedAssemblyMessage>
     <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard2.0'">4.6.0.0</AssemblyVersion>
     <DefineConstants Condition="'$(TargetsNetCoreApp)' != 'true'">$(DefineConstants);NETSTANDARD2_0</DefineConstants>
-    <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);FEATURE_TCPKEEPALIVE</DefineConstants>
+    <DefineConstants Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">$(DefineConstants);FEATURE_TCPKEEPALIVE</DefineConstants>
     <Nullable>annotations</Nullable>
-    <DefineConstants Condition="'$(TargetGroup)' != 'netcoreapp'">$(DefineConstants);INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;netcoreapp2.1-Unix-Debug;netcoreapp2.1-Unix-Release;netcoreapp2.1-Windows_NT-Debug;netcoreapp2.1-Windows_NT-Release;netstandard2.0-Unix-Debug;netstandard2.0-Unix-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release;</Configurations>
+    <DefineConstants Condition="'$(TargetGroup)' != '$(NetCoreAppCurrent)'">$(DefineConstants);INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;netcoreapp2.1-Unix-Debug;netcoreapp2.1-Unix-Release;netcoreapp2.1-Windows_NT-Debug;netcoreapp2.1-Windows_NT-Release;netstandard2.0-Unix-Debug;netstandard2.0-Unix-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release;</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="System.Data.SqlClient.TypeForwards.cs" />
@@ -229,7 +229,7 @@
     <Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.Windows.cs">
       <Link>System\IO\PathInternal.Windows.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)System\Runtime\InteropServices\SuppressGCTransitionAttribute.internal.cs" Condition="'$(TargetGroup)' != 'netcoreapp'">
+    <Compile Include="$(CommonPath)System\Runtime\InteropServices\SuppressGCTransitionAttribute.internal.cs" Condition="'$(TargetGroup)' != '$(NetCoreAppCurrent)'">
       <Link>Common\System\Runtime\InteropServices\SuppressGCTransitionAttribute.internal.cs</Link>
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\Text\ValueStringBuilder.cs">

diff --git a/src/libraries/System.Data.SqlClient/tests/FunctionalTests/Configurations.props b/src/libraries/System.Data.SqlClient/tests/FunctionalTests/Configurations.props
index 42a40e4..9f1e7e9 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Data.SqlClient/tests/FunctionalTests/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netfx-Windows_NT;
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj b/src/libraries/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj
index 4573bf8..be14e74 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj
+++ b/src/libraries/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />

diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/Configurations.props b/src/libraries/System.Data.SqlClient/tests/ManualTests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/ManualTests/Configurations.props
+++ b/src/libraries/System.Data.SqlClient/tests/ManualTests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj b/src/libraries/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj
index ec584d5..2ad3478 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/libraries/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs">
@@ -146,7 +146,7 @@
     <None Include="SQL\ParameterTest\SqlParameterTest_DebugMode.bsl" />
     <None Include="SQL\ParameterTest\SqlParameterTest_ReleaseMode.bsl" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <Compile Include="SQL\ConnectionPoolTest\PoolBlockPeriodTest.netcoreapp.cs" />
     <Compile Include="SQL\SqlFileStreamTest\SqlFileStreamTest.cs" />
   </ItemGroup>

diff --git a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/Configurations.props b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/Configurations.props
index c472e2a..f350311 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/Configurations.props
+++ b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/System.Data.SqlClient.Stress.Tests.csproj b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/System.Data.SqlClient.Stress.Tests.csproj
index 6491031..5cf78a8 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/System.Data.SqlClient.Stress.Tests.csproj
+++ b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/System.Data.SqlClient.Stress.Tests.csproj
@@ -3,8 +3,8 @@
     <RootNamespace>Stress.Data.SqlClient</RootNamespace>
     <AssemblyName>System.Data.SqlClient.Stress.Tests</AssemblyName>
     <!-- These should not run in Helix: they produce no outputs and are only run manually -->
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
     <IgnoreForCI>true</IgnoreForCI>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Data.StressRunner\System.Data.StressRunner.csproj" />

diff --git a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/Configurations.props b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/Configurations.props
index c472e2a..f350311 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/Configurations.props
+++ b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj
index b78ec11..76649bd 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj
+++ b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>Stress.Data</RootNamespace>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Data.StressRunner\System.Data.StressRunner.csproj" />

diff --git a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/Configurations.props b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/Configurations.props
index c472e2a..f350311 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/Configurations.props
+++ b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj
index 6d9050a..8978d12 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj
+++ b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj
@@ -3,7 +3,7 @@
     <RootNamespace>DPStressHarness</RootNamespace>
     <OutputType>Exe</OutputType>
     <NoWarn>3021</NoWarn>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\IMonitorLoader\IMonitorLoader.csproj" />

diff --git a/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln b/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
index a006fc6..33ab4c6 100644 (file)
--- a/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
+++ b/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {13426B04-D1AC-4423-8519-F3EB44943B9D}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {13426B04-D1AC-4423-8519-F3EB44943B9D}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {13426B04-D1AC-4423-8519-F3EB44943B9D}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {13426B04-D1AC-4423-8519-F3EB44943B9D}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {5E0B1760-8753-467A-8B10-66B8994220DB}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {5E0B1760-8753-467A-8B10-66B8994220DB}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {5E0B1760-8753-467A-8B10-66B8994220DB}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {5E0B1760-8753-467A-8B10-66B8994220DB}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {13426B04-D1AC-4423-8519-F3EB44943B9D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {13426B04-D1AC-4423-8519-F3EB44943B9D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {13426B04-D1AC-4423-8519-F3EB44943B9D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {13426B04-D1AC-4423-8519-F3EB44943B9D}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5E0B1760-8753-467A-8B10-66B8994220DB}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {5E0B1760-8753-467A-8B10-66B8994220DB}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {5E0B1760-8753-467A-8B10-66B8994220DB}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {5E0B1760-8753-467A-8B10-66B8994220DB}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Diagnostics.Contracts/ref/Configurations.props b/src/libraries/System.Diagnostics.Contracts/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.Contracts/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.Contracts/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj b/src/libraries/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj
index ff5eb1d..fb78412 100644 (file)
--- a/src/libraries/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj
+++ b/src/libraries/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Diagnostics.Contracts/src/Configurations.props b/src/libraries/System.Diagnostics.Contracts/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Diagnostics.Contracts/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Contracts/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj b/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj
index ecde8c9..e72ee81 100644 (file)
--- a/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj
+++ b/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Diagnostics.Contracts</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Diagnostics.Contracts/tests/Configurations.props b/src/libraries/System.Diagnostics.Contracts/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.Contracts/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.Contracts/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj b/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj
index 78f5b87..cce4715 100644 (file)
--- a/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln b/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
index 431f9cf..46f3148 100644 (file)
--- a/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
+++ b/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {56F67E92-E606-435E-A00F-003CBFB26945}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {56F67E92-E606-435E-A00F-003CBFB26945}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {56F67E92-E606-435E-A00F-003CBFB26945}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {56F67E92-E606-435E-A00F-003CBFB26945}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {2CBC7A79-EDF5-4552-B25D-8E32E367571E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2CBC7A79-EDF5-4552-B25D-8E32E367571E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2CBC7A79-EDF5-4552-B25D-8E32E367571E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2CBC7A79-EDF5-4552-B25D-8E32E367571E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {56F67E92-E606-435E-A00F-003CBFB26945}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {56F67E92-E606-435E-A00F-003CBFB26945}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {56F67E92-E606-435E-A00F-003CBFB26945}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {56F67E92-E606-435E-A00F-003CBFB26945}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {2CBC7A79-EDF5-4552-B25D-8E32E367571E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2CBC7A79-EDF5-4552-B25D-8E32E367571E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2CBC7A79-EDF5-4552-B25D-8E32E367571E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2CBC7A79-EDF5-4552-B25D-8E32E367571E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Diagnostics.Debug/ref/Configurations.props b/src/libraries/System.Diagnostics.Debug/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.Debug/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.Debug/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj b/src/libraries/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj
index 2ec7a40..d0f8dc2 100644 (file)
--- a/src/libraries/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj
+++ b/src/libraries/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Diagnostics.Debug/src/Configurations.props b/src/libraries/System.Diagnostics.Debug/src/Configurations.props
index 7e12b46..c31cf2a 100644 (file)
--- a/src/libraries/System.Diagnostics.Debug/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Debug/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj b/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
index eb0408e..4f03a4d 100644 (file)
--- a/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
+++ b/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Diagnostics.Debug</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Diagnostics.Debug/tests/Configurations.props b/src/libraries/System.Diagnostics.Debug/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.Debug/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.Debug/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
index 9baca4b..27f735d 100644 (file)
--- a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>System.Diagnostics.Tests</RootNamespace>
     <IgnoreArchitectureMismatches>true</IgnoreArchitectureMismatches>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln b/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
index e933042..0f4306b 100644 (file)
--- a/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {F24D3391-2928-4E83-AADE-B34423498750}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F24D3391-2928-4E83-AADE-B34423498750}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F24D3391-2928-4E83-AADE-B34423498750}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F24D3391-2928-4E83-AADE-B34423498750}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {F24D3391-2928-4E83-AADE-B34423498750}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F24D3391-2928-4E83-AADE-B34423498750}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F24D3391-2928-4E83-AADE-B34423498750}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F24D3391-2928-4E83-AADE-B34423498750}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/ref/Configurations.props b/src/libraries/System.Diagnostics.DiagnosticSource/ref/Configurations.props
index 53a1fe3..839799c 100644 (file)
--- a/src/libraries/System.Diagnostics.DiagnosticSource/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/ref/Configurations.props
@@ -8,7 +8,7 @@
     <BuildConfigurations>
       $(PackageConfigurations);
       netstandard2.0;
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj
index bca5df7..017f85c 100644 (file)
--- a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>net45-Debug;net45-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
+    <Configurations>net45-Debug;net45-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
     <CLSCompliant>false</CLSCompliant>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetGroup)' == 'net45' or '$(TargetGroup)' == 'netfx'">
+  <PropertyGroup Condition="'$(TargetGroup)' == 'net45' or '$(TargetGroup)' == '$(NetFrameworkCurrent)'">
     <DefineConstants>$(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
@@ -14,14 +14,14 @@
     <Compile Include="System.Diagnostics.DiagnosticSourceActivity.cs" />
     <Reference Include="System.Memory" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'net45' or '$(TargetGroup)' == 'netfx'">
+  <ItemGroup Condition="'$(TargetGroup)' == 'net45' or '$(TargetGroup)' == '$(NetFrameworkCurrent)'">
     <Reference Include="mscorlib" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetGroup)' == 'net45'">
     <Reference Include="System.Runtime" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetFrameworkCurrent)'">
     <Reference Include="netstandard" />
   </ItemGroup>
 

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/Configurations.props b/src/libraries/System.Diagnostics.DiagnosticSource/src/Configurations.props
index 4c97411..6278dad 100644 (file)
--- a/src/libraries/System.Diagnostics.DiagnosticSource/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/Configurations.props
@@ -8,9 +8,9 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
       netstandard2.0;
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
index 94022a3..4edb574 100644 (file)
--- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
@@ -13,7 +13,7 @@
     <DefineConstants Condition="'$(TargetFramework)' != 'netstandard1.1'">$(DefineConstants);EVENTSOURCE_ACTIVITY_SUPPORT</DefineConstants>
     <DefineConstants Condition="'$(TargetFramework)' != 'netstandard1.1' and '$(TargetFramework)' != 'netstandard1.3'">$(DefineConstants);EVENTSOURCE_ENUMERATE_SUPPORT</DefineConstants>
     <DefineConstants Condition="'$(TargetsNetFx)' == 'true'">$(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS;ENABLE_HTTP_HANDLER</DefineConstants>
-    <Configurations>net45-Debug;net45-Release;net46-Debug;net46-Release;netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
+    <Configurations>net45-Debug;net45-Release;net46-Debug;net46-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Diagnostics\DiagnosticSource.cs" />
@@ -51,7 +51,7 @@
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
     <Compile Include="System\Diagnostics\HttpHandlerDiagnosticListener.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' != 'netfx'">
+  <ItemGroup Condition="'$(TargetGroup)' != '$(NetFrameworkCurrent)'">
     <Reference Include="System.Collections" />
     <Reference Include="System.Collections.Concurrent" />
     <Reference Include="System.Diagnostics.Debug" />

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/Configurations.props b/src/libraries/System.Diagnostics.DiagnosticSource/tests/Configurations.props
index 43256ff..230da32 100644 (file)
--- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj
index 3aba3e3..18190fd 100644 (file)
--- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetsNetFx)' != 'true'">
     <Compile Include="DiagnosticSourceEventSourceBridgeTests.cs" />

diff --git a/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln b/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln
index d49070b..fff940f 100644 (file)
--- a/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln
+++ b/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {5B218883-369E-4C3D-8BD0-74843474DCBD}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {5B218883-369E-4C3D-8BD0-74843474DCBD}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {5B218883-369E-4C3D-8BD0-74843474DCBD}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {5B218883-369E-4C3D-8BD0-74843474DCBD}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {432779B9-3CBD-4871-A7DC-D8A192319DBD}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {432779B9-3CBD-4871-A7DC-D8A192319DBD}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {432779B9-3CBD-4871-A7DC-D8A192319DBD}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {432779B9-3CBD-4871-A7DC-D8A192319DBD}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {5B218883-369E-4C3D-8BD0-74843474DCBD}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5B218883-369E-4C3D-8BD0-74843474DCBD}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5B218883-369E-4C3D-8BD0-74843474DCBD}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5B218883-369E-4C3D-8BD0-74843474DCBD}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {432779B9-3CBD-4871-A7DC-D8A192319DBD}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {432779B9-3CBD-4871-A7DC-D8A192319DBD}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {432779B9-3CBD-4871-A7DC-D8A192319DBD}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {432779B9-3CBD-4871-A7DC-D8A192319DBD}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {F405C42E-EF6F-4404-80FD-3B87E216707C}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {F405C42E-EF6F-4404-80FD-3B87E216707C}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {F405C42E-EF6F-4404-80FD-3B87E216707C}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Diagnostics.EventLog/ref/Configurations.props b/src/libraries/System.Diagnostics.EventLog/ref/Configurations.props
index d7207b4..9901e60 100644 (file)
--- a/src/libraries/System.Diagnostics.EventLog/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.EventLog/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netfx;
+      $(NetFrameworkCurrent);
       net461;
       netstandard2.0;
     </BuildConfigurations>

diff --git a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj
index fb77cf2..6c1b2d0 100644 (file)
--- a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj
+++ b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.EventLog.cs" />

diff --git a/src/libraries/System.Diagnostics.EventLog/src/Configurations.props b/src/libraries/System.Diagnostics.EventLog/src/Configurations.props
index fa6a00f..944cd7c 100644 (file)
--- a/src/libraries/System.Diagnostics.EventLog/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.EventLog/src/Configurations.props
@@ -7,8 +7,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netcoreapp-Windows_NT;
-      netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
index 40f3ad1..74837d9 100644 (file)
--- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
+++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_EventLog</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="System\Diagnostics\EntryWrittenEventArgs.cs" />

diff --git a/src/libraries/System.Diagnostics.EventLog/tests/Configurations.props b/src/libraries/System.Diagnostics.EventLog/tests/Configurations.props
index 79e917c..07d8052 100644 (file)
--- a/src/libraries/System.Diagnostics.EventLog/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.EventLog/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj b/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj
index 0825bea..de7a32a 100644 (file)
--- a/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj
+++ b/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="EventInstanceTests.cs" />

diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln b/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
index 3a51334..df6fc46 100644 (file)
--- a/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
@@ -46,10 +46,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {3002560A-5097-4A65-B562-93E335E64163}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {3002560A-5097-4A65-B562-93E335E64163}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {3002560A-5097-4A65-B562-93E335E64163}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
@@ -62,18 +62,18 @@ Global
                {925D347C-697C-4777-8995-62426C6866F2}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {925D347C-697C-4777-8995-62426C6866F2}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
                {925D347C-697C-4777-8995-62426C6866F2}.Release|Any CPU.Build.0 = netstandard2.0-Release|Any CPU
-               {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {00EDA5FD-E802-40D3-92D5-56C27612D36D}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {00EDA5FD-E802-40D3-92D5-56C27612D36D}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {00EDA5FD-E802-40D3-92D5-56C27612D36D}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {00EDA5FD-E802-40D3-92D5-56C27612D36D}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F815A563-B6B8-49F3-9E90-1A134033B864}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F815A563-B6B8-49F3-9E90-1A134033B864}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F815A563-B6B8-49F3-9E90-1A134033B864}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F815A563-B6B8-49F3-9E90-1A134033B864}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {00EDA5FD-E802-40D3-92D5-56C27612D36D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {00EDA5FD-E802-40D3-92D5-56C27612D36D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {00EDA5FD-E802-40D3-92D5-56C27612D36D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {00EDA5FD-E802-40D3-92D5-56C27612D36D}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F815A563-B6B8-49F3-9E90-1A134033B864}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F815A563-B6B8-49F3-9E90-1A134033B864}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F815A563-B6B8-49F3-9E90-1A134033B864}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F815A563-B6B8-49F3-9E90-1A134033B864}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/ref/Configurations.props b/src/libraries/System.Diagnostics.FileVersionInfo/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.FileVersionInfo/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj
index 4b3b7a5..e7a966c 100644 (file)
--- a/src/libraries/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.FileVersionInfo.cs" />

diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/src/Configurations.props b/src/libraries/System.Diagnostics.FileVersionInfo/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.Diagnostics.FileVersionInfo/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
index 558d385..4832aa6 100644 (file)
--- a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Diagnostics.FileVersionInfo</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573</NoWarn>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Diagnostics\FileVersionInfo.cs" />

diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/Configurations.props b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/Configurations.props
index 7997802..4fead5c 100644 (file)
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/Configurations.props
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj
index f043092..4c7e232 100644 (file)
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetExt>.dll</TargetExt>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Assembly1.cs" />

diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/Configurations.props b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/Configurations.props
index 19a5b59..8a0bfd1 100644 (file)
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
index 056b835..be563cb 100644 (file)
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>System.Diagnostics.FileVersionInfo.Tests</AssemblyName>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln b/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
index 66ab08a..ebf177e 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {296074B7-1CC9-497E-8C1E-FC5C985C75C6}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {296074B7-1CC9-497E-8C1E-FC5C985C75C6}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {296074B7-1CC9-497E-8C1E-FC5C985C75C6}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {296074B7-1CC9-497E-8C1E-FC5C985C75C6}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {296074B7-1CC9-497E-8C1E-FC5C985C75C6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {296074B7-1CC9-497E-8C1E-FC5C985C75C6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {296074B7-1CC9-497E-8C1E-FC5C985C75C6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {296074B7-1CC9-497E-8C1E-FC5C985C75C6}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {5BDC8641-E3EE-47B5-BE7B-2D2275402412}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {5BDC8641-E3EE-47B5-BE7B-2D2275402412}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {5BDC8641-E3EE-47B5-BE7B-2D2275402412}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/ref/Configurations.props b/src/libraries/System.Diagnostics.PerformanceCounter/ref/Configurations.props
index 287d887..e4dc4a7 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/ref/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       net461;
-      netfx;
+      $(NetFrameworkCurrent);
       netstandard2.0;
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj
index 6318ac2..39fd556 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/Configurations.props b/src/libraries/System.Diagnostics.PerformanceCounter/src/Configurations.props
index 9edd3c2..36a3227 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/Configurations.props
@@ -7,8 +7,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netcoreapp-Windows_NT;
-      netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
index ee663dd..d66daa2 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_PerfCounters</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp'))">
     <Compile Include="System\Diagnostics\DiagnosticsConfiguration.cs" />

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/tests/Configurations.props b/src/libraries/System.Diagnostics.PerformanceCounter/tests/Configurations.props
index 258f866..60317cf 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj
index 97c3cbf..86e0cef 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Win32Resource>provider.res</Win32Resource>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="PerformanceCounterTests.cs" />

diff --git a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
index 7941428..7dbb729 100644 (file)
--- a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
+++ b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F55047F8-E47B-46E3-B221-C23595AFE168}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {F55047F8-E47B-46E3-B221-C23595AFE168}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {F55047F8-E47B-46E3-B221-C23595AFE168}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {F55047F8-E47B-46E3-B221-C23595AFE168}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {98B33275-39D8-4997-867D-04C69C69885E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {98B33275-39D8-4997-867D-04C69C69885E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {98B33275-39D8-4997-867D-04C69C69885E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {98B33275-39D8-4997-867D-04C69C69885E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F55047F8-E47B-46E3-B221-C23595AFE168}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F55047F8-E47B-46E3-B221-C23595AFE168}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F55047F8-E47B-46E3-B221-C23595AFE168}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F55047F8-E47B-46E3-B221-C23595AFE168}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {98B33275-39D8-4997-867D-04C69C69885E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {98B33275-39D8-4997-867D-04C69C69885E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {98B33275-39D8-4997-867D-04C69C69885E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {98B33275-39D8-4997-867D-04C69C69885E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Diagnostics.Process/ref/Configurations.props b/src/libraries/System.Diagnostics.Process/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.Process/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.Process/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj
index 2bbcaea..77943e3 100644 (file)
--- a/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj
+++ b/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.Process.cs" />

diff --git a/src/libraries/System.Diagnostics.Process/src/Configurations.props b/src/libraries/System.Diagnostics.Process/src/Configurations.props
index 72f17e5..212340d 100644 (file)
--- a/src/libraries/System.Diagnostics.Process/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Process/src/Configurations.props
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-FreeBSD;
-      netcoreapp-Linux;
-      netcoreapp-OSX;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-FreeBSD;
+      $(NetCoreAppCurrent)-Linux;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
index e277789..989642c 100644 (file)
--- a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
+++ b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
@@ -5,7 +5,7 @@
     <DefineConstants>$(DefineConstants);FEATURE_REGISTRY</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573</NoWarn>
-    <Configurations>netcoreapp-FreeBSD-Debug;netcoreapp-FreeBSD-Release;netcoreapp-Linux-Debug;netcoreapp-Linux-Release;netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-FreeBSD-Debug;$(NetCoreAppCurrent)-FreeBSD-Release;$(NetCoreAppCurrent)-Linux-Debug;$(NetCoreAppCurrent)-Linux-Release;$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetsFreeBSD)' == 'true' or '$(TargetsUnknownUnix)' == 'true' ">
     <!-- Suppress unused field warnings when using PlatformNotSupportedException stubs -->
@@ -405,7 +405,7 @@
       <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' and '$(TargetsWindows)' == 'true'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)' and '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Shell32\Interop.ShellExecuteExW.cs">
       <Link>Common\Interop\Windows\Shell32\Interop.ShellExecuteExW.cs</Link>
     </Compile>

diff --git a/src/libraries/System.Diagnostics.Process/tests/Configurations.props b/src/libraries/System.Diagnostics.Process/tests/Configurations.props
index dd006cd..75eaac0 100644 (file)
--- a/src/libraries/System.Diagnostics.Process/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.Process/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
index c567a01..bcae59c 100644 (file)
--- a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants Condition="'$(TargetsWindows)' == 'true'">$(DefineConstants);TargetsWindows</DefineConstants>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CoreLibSharedDir)System\PasteArguments.cs">

diff --git a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
index 13ef7b7..01c2491 100644 (file)
--- a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
+++ b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {297A9116-1005-499D-A895-2063D03E4C94}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {297A9116-1005-499D-A895-2063D03E4C94}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {297A9116-1005-499D-A895-2063D03E4C94}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {297A9116-1005-499D-A895-2063D03E4C94}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {02304469-722E-4723-92A1-820B9A37D275}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {02304469-722E-4723-92A1-820B9A37D275}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {02304469-722E-4723-92A1-820B9A37D275}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {02304469-722E-4723-92A1-820B9A37D275}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {C38217EF-88F4-4D56-9F58-780BE1DDAFF6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C38217EF-88F4-4D56-9F58-780BE1DDAFF6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C38217EF-88F4-4D56-9F58-780BE1DDAFF6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C38217EF-88F4-4D56-9F58-780BE1DDAFF6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {297A9116-1005-499D-A895-2063D03E4C94}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {297A9116-1005-499D-A895-2063D03E4C94}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {297A9116-1005-499D-A895-2063D03E4C94}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {297A9116-1005-499D-A895-2063D03E4C94}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {02304469-722E-4723-92A1-820B9A37D275}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {02304469-722E-4723-92A1-820B9A37D275}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {02304469-722E-4723-92A1-820B9A37D275}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {02304469-722E-4723-92A1-820B9A37D275}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {C38217EF-88F4-4D56-9F58-780BE1DDAFF6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C38217EF-88F4-4D56-9F58-780BE1DDAFF6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C38217EF-88F4-4D56-9F58-780BE1DDAFF6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C38217EF-88F4-4D56-9F58-780BE1DDAFF6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Diagnostics.StackTrace/ref/Configurations.props b/src/libraries/System.Diagnostics.StackTrace/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.StackTrace/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.StackTrace/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj b/src/libraries/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj
index bcb4d71..6f7cab9 100644 (file)
--- a/src/libraries/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj
+++ b/src/libraries/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Diagnostics.StackTrace/src/Configurations.props b/src/libraries/System.Diagnostics.StackTrace/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Diagnostics.StackTrace/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.StackTrace/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj b/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
index be32c6c..ae31779 100644 (file)
--- a/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
+++ b/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <!-- Disable 1685 (aka multiple type definitions) warning so it doesn't turn into an error -->
     <NoWarn>$(NoWarn);1685</NoWarn>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Diagnostics\StackFrameExtensions.cs" />

diff --git a/src/libraries/System.Diagnostics.StackTrace/tests/Configurations.props b/src/libraries/System.Diagnostics.StackTrace/tests/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Diagnostics.StackTrace/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.StackTrace/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj b/src/libraries/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj
index 221ea6d..6547308 100644 (file)
--- a/src/libraries/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj
+++ b/src/libraries/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -12,7 +12,7 @@
     <Compile Include="StackFrameTests.cs" />
     <Compile Include="StackFrameExtensionsTests.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <Compile Include="StackTraceSymbolsTests.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln b/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
index a31a621..5fd0a7a 100644 (file)
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {315929D9-D76E-47E9-BE82-C787FB3A7876}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {315929D9-D76E-47E9-BE82-C787FB3A7876}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {315929D9-D76E-47E9-BE82-C787FB3A7876}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {315929D9-D76E-47E9-BE82-C787FB3A7876}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {3E10948B-1753-4CD2-ABB7-7A753EEEC023}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {3E10948B-1753-4CD2-ABB7-7A753EEEC023}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {3E10948B-1753-4CD2-ABB7-7A753EEEC023}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {3E10948B-1753-4CD2-ABB7-7A753EEEC023}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {315929D9-D76E-47E9-BE82-C787FB3A7876}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {315929D9-D76E-47E9-BE82-C787FB3A7876}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {315929D9-D76E-47E9-BE82-C787FB3A7876}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {315929D9-D76E-47E9-BE82-C787FB3A7876}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {3E10948B-1753-4CD2-ABB7-7A753EEEC023}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {3E10948B-1753-4CD2-ABB7-7A753EEEC023}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {3E10948B-1753-4CD2-ABB7-7A753EEEC023}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {3E10948B-1753-4CD2-ABB7-7A753EEEC023}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/Configurations.props b/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj
index 3751d80..3688332 100644 (file)
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.TextWriterTraceListener.cs" />

diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/Configurations.props b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/Configurations.props
index dd006cd..75eaac0 100644 (file)
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj
index 80d4fad..7d865f9 100644 (file)
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>System.Diagnostics.TextWriterTraceListener</RootNamespace>
     <AssemblyName>System.Diagnostics.TextWriterTraceListener</AssemblyName>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FxCopBaseline.cs" />

diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj
index 6a8d48f..48d48b5 100644 (file)
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TestTraceFilter.cs" />

diff --git a/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln b/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln
index 4347a4e..d39ef4f 100644 (file)
--- a/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln
+++ b/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {41BF89E4-8C67-45A6-8044-13009E363220}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {41BF89E4-8C67-45A6-8044-13009E363220}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {41BF89E4-8C67-45A6-8044-13009E363220}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {41BF89E4-8C67-45A6-8044-13009E363220}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {41BF89E4-8C67-45A6-8044-13009E363220}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {41BF89E4-8C67-45A6-8044-13009E363220}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {41BF89E4-8C67-45A6-8044-13009E363220}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {41BF89E4-8C67-45A6-8044-13009E363220}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Diagnostics.Tools/ref/Configurations.props b/src/libraries/System.Diagnostics.Tools/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.Tools/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.Tools/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj b/src/libraries/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj
index 205ab25..9a3e146 100644 (file)
--- a/src/libraries/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj
+++ b/src/libraries/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Diagnostics.Tools/src/Configurations.props b/src/libraries/System.Diagnostics.Tools/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Diagnostics.Tools/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Tools/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj b/src/libraries/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj
index 9534801..2921c06 100644 (file)
--- a/src/libraries/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj
+++ b/src/libraries/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj
@@ -4,7 +4,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <DefineConstants>$(DefineConstants);SYSTEM_DIAGNOSTICS_TOOLS</DefineConstants>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\CodeDom\Compiler\GeneratedCodeAttribute.cs" />

diff --git a/src/libraries/System.Diagnostics.Tools/tests/Configurations.props b/src/libraries/System.Diagnostics.Tools/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.Tools/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.Tools/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj b/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj
index 1fa5315..fb9eaa4 100644 (file)
--- a/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>System</RootNamespace>
     <AssemblyName>System.Diagnostics.Tools.Tests</AssemblyName>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln b/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
index 855ca0e..043906d 100644 (file)
--- a/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
+++ b/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {7B32D24D-969A-4F7F-8461-B43E15E5D553}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {7B32D24D-969A-4F7F-8461-B43E15E5D553}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {7B32D24D-969A-4F7F-8461-B43E15E5D553}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {7B32D24D-969A-4F7F-8461-B43E15E5D553}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {5380420C-EB1D-4C53-9CFC-916578C18334}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {5380420C-EB1D-4C53-9CFC-916578C18334}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {5380420C-EB1D-4C53-9CFC-916578C18334}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {5380420C-EB1D-4C53-9CFC-916578C18334}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {6E515D9C-A5C2-4716-96A1-4716F007267D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6E515D9C-A5C2-4716-96A1-4716F007267D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6E515D9C-A5C2-4716-96A1-4716F007267D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6E515D9C-A5C2-4716-96A1-4716F007267D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {7B32D24D-969A-4F7F-8461-B43E15E5D553}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7B32D24D-969A-4F7F-8461-B43E15E5D553}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7B32D24D-969A-4F7F-8461-B43E15E5D553}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {7B32D24D-969A-4F7F-8461-B43E15E5D553}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5380420C-EB1D-4C53-9CFC-916578C18334}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5380420C-EB1D-4C53-9CFC-916578C18334}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5380420C-EB1D-4C53-9CFC-916578C18334}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5380420C-EB1D-4C53-9CFC-916578C18334}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {6E515D9C-A5C2-4716-96A1-4716F007267D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6E515D9C-A5C2-4716-96A1-4716F007267D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6E515D9C-A5C2-4716-96A1-4716F007267D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6E515D9C-A5C2-4716-96A1-4716F007267D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Diagnostics.TraceSource/ref/Configurations.props b/src/libraries/System.Diagnostics.TraceSource/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.TraceSource/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.TraceSource/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj
index 45a1b5d..0cbc54e 100644 (file)
--- a/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj
+++ b/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.TraceSource.cs" />

diff --git a/src/libraries/System.Diagnostics.TraceSource/src/Configurations.props b/src/libraries/System.Diagnostics.TraceSource/src/Configurations.props
index 72f17e5..212340d 100644 (file)
--- a/src/libraries/System.Diagnostics.TraceSource/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.TraceSource/src/Configurations.props
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-FreeBSD;
-      netcoreapp-Linux;
-      netcoreapp-OSX;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-FreeBSD;
+      $(NetCoreAppCurrent)-Linux;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
index 3e08189..92695aa 100644 (file)
--- a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
+++ b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
@@ -3,7 +3,7 @@
     <RootNamespace>System.Diagnostics.TraceSource</RootNamespace>
     <AssemblyName>System.Diagnostics.TraceSource</AssemblyName>
     <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
-    <Configurations>netcoreapp-FreeBSD-Debug;netcoreapp-FreeBSD-Release;netcoreapp-Linux-Debug;netcoreapp-Linux-Release;netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-FreeBSD-Debug;$(NetCoreAppCurrent)-FreeBSD-Release;$(NetCoreAppCurrent)-Linux-Debug;$(NetCoreAppCurrent)-Linux-Release;$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FxCopBaseline.cs" />

diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/Configurations.props b/src/libraries/System.Diagnostics.TraceSource/tests/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Diagnostics.TraceSource/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.TraceSource/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj b/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj
index e044346..eaceb29 100644 (file)
--- a/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj
+++ b/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />

diff --git a/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln b/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
index 264d2b5..f8c06dc 100644 (file)
--- a/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
+++ b/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Diagnostics.Tracing/ref/Configurations.props b/src/libraries/System.Diagnostics.Tracing/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Diagnostics.Tracing/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.Tracing/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj b/src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj
index 5bf5eac..e5fdf84 100644 (file)
--- a/src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj
+++ b/src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <!-- CS0067: unused event, reference assembly does not care -->
     <NoWarn>$(NoWarn);0067</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Diagnostics.Tracing/src/Configurations.props b/src/libraries/System.Diagnostics.Tracing/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Diagnostics.Tracing/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Tracing/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj b/src/libraries/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj
index 1b5a587..d5378c3 100644 (file)
--- a/src/libraries/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj
+++ b/src/libraries/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Diagnostics.Tracing</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Diagnostics.Tracing/tests/Configurations.props b/src/libraries/System.Diagnostics.Tracing/tests/Configurations.props
index dd006cd..75eaac0 100644 (file)
--- a/src/libraries/System.Diagnostics.Tracing/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.Tracing/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj
index 7b71356..ff9cc20 100644 (file)
--- a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <!--Windows only files -->

diff --git a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
index 98ba052..4eedb21 100644 (file)
--- a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
+++ b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {879C23DC-D828-4DFB-8E92-ABBC11B71035}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {879C23DC-D828-4DFB-8E92-ABBC11B71035}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {879C23DC-D828-4DFB-8E92-ABBC11B71035}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {879C23DC-D828-4DFB-8E92-ABBC11B71035}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {879C23DC-D828-4DFB-8E92-ABBC11B71035}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {879C23DC-D828-4DFB-8E92-ABBC11B71035}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {879C23DC-D828-4DFB-8E92-ABBC11B71035}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {879C23DC-D828-4DFB-8E92-ABBC11B71035}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {404455B6-466C-4F78-9DCC-C37DCC0B75DA}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {404455B6-466C-4F78-9DCC-C37DCC0B75DA}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {404455B6-466C-4F78-9DCC-C37DCC0B75DA}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/Configurations.props b/src/libraries/System.DirectoryServices.AccountManagement/src/Configurations.props
index c4215ea..aefe09f 100644 (file)
--- a/src/libraries/System.DirectoryServices.AccountManagement/src/Configurations.props
+++ b/src/libraries/System.DirectoryServices.AccountManagement/src/Configurations.props
@@ -6,8 +6,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
-      _netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
index c935c28..f876cf0 100644 (file)
--- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
+++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
@@ -6,7 +6,7 @@
     <NoWarn>$(NoWarn);8073;CA1810</NoWarn>
     <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.DirectoryServicesAccountManagement_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' != 'true'">
     <Compile Include="System\DirectoryServices\AccountManagement\ExternDll.cs" />

diff --git a/src/libraries/System.DirectoryServices.AccountManagement/tests/Configurations.props b/src/libraries/System.DirectoryServices.AccountManagement/tests/Configurations.props
index 258f866..60317cf 100644 (file)
--- a/src/libraries/System.DirectoryServices.AccountManagement/tests/Configurations.props
+++ b/src/libraries/System.DirectoryServices.AccountManagement/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj
index 44b207b..de5eca2 100644 (file)
--- a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj
+++ b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ComputerPrincipalTest.cs" />

diff --git a/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln b/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
index d3573ef..e1ea5a4 100644 (file)
--- a/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
+++ b/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {6638C675-CD62-408F-AB3B-AAFD8A906A96}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {6638C675-CD62-408F-AB3B-AAFD8A906A96}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {6638C675-CD62-408F-AB3B-AAFD8A906A96}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {6638C675-CD62-408F-AB3B-AAFD8A906A96}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {135980AC-4583-44EC-894E-CB3B1A481920}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {135980AC-4583-44EC-894E-CB3B1A481920}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {135980AC-4583-44EC-894E-CB3B1A481920}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {135980AC-4583-44EC-894E-CB3B1A481920}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {6638C675-CD62-408F-AB3B-AAFD8A906A96}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {6638C675-CD62-408F-AB3B-AAFD8A906A96}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {6638C675-CD62-408F-AB3B-AAFD8A906A96}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {6638C675-CD62-408F-AB3B-AAFD8A906A96}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {135980AC-4583-44EC-894E-CB3B1A481920}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {135980AC-4583-44EC-894E-CB3B1A481920}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {135980AC-4583-44EC-894E-CB3B1A481920}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {135980AC-4583-44EC-894E-CB3B1A481920}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {7DEA4539-9A0D-4801-B229-3824710EBCEE}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {7DEA4539-9A0D-4801-B229-3824710EBCEE}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {7DEA4539-9A0D-4801-B229-3824710EBCEE}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.DirectoryServices.Protocols/src/Configurations.props b/src/libraries/System.DirectoryServices.Protocols/src/Configurations.props
index c4215ea..aefe09f 100644 (file)
--- a/src/libraries/System.DirectoryServices.Protocols/src/Configurations.props
+++ b/src/libraries/System.DirectoryServices.Protocols/src/Configurations.props
@@ -6,8 +6,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
-      _netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
index 702fd0e..4554072 100644 (file)
--- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
@@ -5,7 +5,7 @@
     <NoWarn>$(NoWarn);0649;CA1810</NoWarn>
     <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.DirectoryServicesProtocols_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' != 'true'">
     <Compile Include="System\DirectoryServices\Protocols\common\AuthTypes.cs" />
@@ -56,7 +56,7 @@
     <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Xml.ReaderWriter" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <Reference Include="System.ComponentModel.Primitives" />
   </ItemGroup>
 </Project>

diff --git a/src/libraries/System.DirectoryServices.Protocols/tests/Configurations.props b/src/libraries/System.DirectoryServices.Protocols/tests/Configurations.props
index 9b3928d..6b39e74 100644 (file)
--- a/src/libraries/System.DirectoryServices.Protocols/tests/Configurations.props
+++ b/src/libraries/System.DirectoryServices.Protocols/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-        netcoreapp-Windows_NT;
-        netfx;
+        $(NetCoreAppCurrent)-Windows_NT;
+        $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj b/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj
index fb11a12..e7504f8 100644 (file)
--- a/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj
+++ b/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BerConverterTests.cs" />

diff --git a/src/libraries/System.DirectoryServices/System.DirectoryServices.sln b/src/libraries/System.DirectoryServices/System.DirectoryServices.sln
index a7e028f..6e7c3a9 100644 (file)
--- a/src/libraries/System.DirectoryServices/System.DirectoryServices.sln
+++ b/src/libraries/System.DirectoryServices/System.DirectoryServices.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {DDE3838B-0EEA-4D9A-A120-9D72CB33F250}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {DDE3838B-0EEA-4D9A-A120-9D72CB33F250}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {DDE3838B-0EEA-4D9A-A120-9D72CB33F250}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {DDE3838B-0EEA-4D9A-A120-9D72CB33F250}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {DDE3838B-0EEA-4D9A-A120-9D72CB33F250}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {DDE3838B-0EEA-4D9A-A120-9D72CB33F250}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {DDE3838B-0EEA-4D9A-A120-9D72CB33F250}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {DDE3838B-0EEA-4D9A-A120-9D72CB33F250}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {CBCDA53B-4C01-4267-B08C-413205FE4D8D}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {CBCDA53B-4C01-4267-B08C-413205FE4D8D}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {CBCDA53B-4C01-4267-B08C-413205FE4D8D}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.DirectoryServices/ref/Configurations.props b/src/libraries/System.DirectoryServices/ref/Configurations.props
index a5f5bb4..7813482 100644 (file)
--- a/src/libraries/System.DirectoryServices/ref/Configurations.props
+++ b/src/libraries/System.DirectoryServices/ref/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      _netfx;
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.DirectoryServices/src/Configurations.props b/src/libraries/System.DirectoryServices/src/Configurations.props
index c4215ea..aefe09f 100644 (file)
--- a/src/libraries/System.DirectoryServices/src/Configurations.props
+++ b/src/libraries/System.DirectoryServices/src/Configurations.props
@@ -6,8 +6,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
-      _netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
index a74062d..e03a0e9 100644 (file)
--- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
+++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);0649</NoWarn>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.DirectoryServices_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' != 'true'">
     <Compile Include="System\DirectoryServices\ExternDll.cs" />

diff --git a/src/libraries/System.DirectoryServices/tests/Configurations.props b/src/libraries/System.DirectoryServices/tests/Configurations.props
index c03a496..cc3d67b 100644 (file)
--- a/src/libraries/System.DirectoryServices/tests/Configurations.props
+++ b/src/libraries/System.DirectoryServices/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
index 531d5ce..e3d130d 100644 (file)
--- a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
+++ b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\DirectoryServices\ActiveDirectorySecurityTests.cs" />

diff --git a/src/libraries/System.Drawing.Common/System.Drawing.Common.sln b/src/libraries/System.Drawing.Common/System.Drawing.Common.sln
index a3d9e63..85712d6 100644 (file)
--- a/src/libraries/System.Drawing.Common/System.Drawing.Common.sln
+++ b/src/libraries/System.Drawing.Common/System.Drawing.Common.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {4B93E684-0630-45F4-8F63-6C7788C9892F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4B93E684-0630-45F4-8F63-6C7788C9892F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4B93E684-0630-45F4-8F63-6C7788C9892F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4B93E684-0630-45F4-8F63-6C7788C9892F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {191B3618-FECD-4ABD-9D6B-5AC90DC33621}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {191B3618-FECD-4ABD-9D6B-5AC90DC33621}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {191B3618-FECD-4ABD-9D6B-5AC90DC33621}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {191B3618-FECD-4ABD-9D6B-5AC90DC33621}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {D7AEA698-275D-441F-B7A7-8491D1F0EFF0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D7AEA698-275D-441F-B7A7-8491D1F0EFF0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D7AEA698-275D-441F-B7A7-8491D1F0EFF0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D7AEA698-275D-441F-B7A7-8491D1F0EFF0}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {4B93E684-0630-45F4-8F63-6C7788C9892F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4B93E684-0630-45F4-8F63-6C7788C9892F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4B93E684-0630-45F4-8F63-6C7788C9892F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4B93E684-0630-45F4-8F63-6C7788C9892F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {191B3618-FECD-4ABD-9D6B-5AC90DC33621}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {191B3618-FECD-4ABD-9D6B-5AC90DC33621}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {191B3618-FECD-4ABD-9D6B-5AC90DC33621}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {191B3618-FECD-4ABD-9D6B-5AC90DC33621}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D7AEA698-275D-441F-B7A7-8491D1F0EFF0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D7AEA698-275D-441F-B7A7-8491D1F0EFF0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D7AEA698-275D-441F-B7A7-8491D1F0EFF0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D7AEA698-275D-441F-B7A7-8491D1F0EFF0}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Drawing.Common/ref/Configurations.props b/src/libraries/System.Drawing.Common/ref/Configurations.props
index f6425e5..a03a315 100644 (file)
--- a/src/libraries/System.Drawing.Common/ref/Configurations.props
+++ b/src/libraries/System.Drawing.Common/ref/Configurations.props
@@ -5,7 +5,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj
index 4ea035d..1e6fa9b 100644 (file)
--- a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj
+++ b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Drawing.Common.cs" />

diff --git a/src/libraries/System.Drawing.Common/src/Configurations.props b/src/libraries/System.Drawing.Common/src/Configurations.props
index 765b7fe..452e3cd 100644 (file)
--- a/src/libraries/System.Drawing.Common/src/Configurations.props
+++ b/src/libraries/System.Drawing.Common/src/Configurations.props
@@ -6,8 +6,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
index 847c2b9..fb6e5c1 100644 (file)
--- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
+++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
@@ -5,7 +5,7 @@
     <WarningsNotAsErrors>CS0618</WarningsNotAsErrors>
     <DefineConstants Condition="'$(TargetsWindows)' == 'true'">$(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS;FEATURE_SYSTEM_EVENTS</DefineConstants>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp3.0-Unix-Debug;netcoreapp3.0-Unix-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp3.0-Unix-Debug;netcoreapp3.0-Unix-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Drawing\Bitmap.cs" />

diff --git a/src/libraries/System.Drawing.Common/tests/Configurations.props b/src/libraries/System.Drawing.Common/tests/Configurations.props
index 7538cfb..4d7a02a 100644 (file)
--- a/src/libraries/System.Drawing.Common/tests/Configurations.props
+++ b/src/libraries/System.Drawing.Common/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
index 215f610..25cf882 100644 (file)
--- a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
+++ b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BitmapTests.cs" />

diff --git a/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln b/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln
index 51970ae..7142a43 100644 (file)
--- a/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln
+++ b/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Drawing.Primitives/ref/Configurations.props b/src/libraries/System.Drawing.Primitives/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Drawing.Primitives/ref/Configurations.props
+++ b/src/libraries/System.Drawing.Primitives/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj b/src/libraries/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj
index d0f1c8d..e1dc8f8 100644 (file)
--- a/src/libraries/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj
+++ b/src/libraries/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Drawing.Primitives/src/Configurations.props b/src/libraries/System.Drawing.Primitives/src/Configurations.props
index dd006cd..75eaac0 100644 (file)
--- a/src/libraries/System.Drawing.Primitives/src/Configurations.props
+++ b/src/libraries/System.Drawing.Primitives/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
index 972fd07..b7c8ebc 100644 (file)
--- a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
+++ b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>System.Drawing</RootNamespace>
     <AssemblyName>System.Drawing.Primitives</AssemblyName>
     <DefineConstants Condition="'$(TargetsWindows)' == 'true'">$(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS</DefineConstants>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <nullable>enable</nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Drawing.Primitives/tests/Configurations.props b/src/libraries/System.Drawing.Primitives/tests/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Drawing.Primitives/tests/Configurations.props
+++ b/src/libraries/System.Drawing.Primitives/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj b/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj
index 0850a88..9e3af0b 100644 (file)
--- a/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj
+++ b/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ColorTranslatorTests.cs" />

diff --git a/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln b/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln
index 85ee376..3cac828 100644 (file)
--- a/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln
+++ b/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {4E604291-4118-4CD6-B790-BA5F4F8C1A18}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4E604291-4118-4CD6-B790-BA5F4F8C1A18}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4E604291-4118-4CD6-B790-BA5F4F8C1A18}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4E604291-4118-4CD6-B790-BA5F4F8C1A18}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {4E604291-4118-4CD6-B790-BA5F4F8C1A18}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4E604291-4118-4CD6-B790-BA5F4F8C1A18}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4E604291-4118-4CD6-B790-BA5F4F8C1A18}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4E604291-4118-4CD6-B790-BA5F4F8C1A18}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Dynamic.Runtime/ref/Configurations.props b/src/libraries/System.Dynamic.Runtime/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Dynamic.Runtime/ref/Configurations.props
+++ b/src/libraries/System.Dynamic.Runtime/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj b/src/libraries/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj
index 00d55a5..c70b4e1 100644 (file)
--- a/src/libraries/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj
+++ b/src/libraries/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Dynamic.Runtime.cs" />

diff --git a/src/libraries/System.Dynamic.Runtime/src/Configurations.props b/src/libraries/System.Dynamic.Runtime/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Dynamic.Runtime/src/Configurations.props
+++ b/src/libraries/System.Dynamic.Runtime/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj b/src/libraries/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj
index c5d3060..689fd0b 100644 (file)
--- a/src/libraries/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj
+++ b/src/libraries/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Dynamic.Runtime</AssemblyName>
     <RootNamespace>System.Dynamic.Runtime</RootNamespace>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Linq.Expressions" />

diff --git a/src/libraries/System.Dynamic.Runtime/tests/Configurations.props b/src/libraries/System.Dynamic.Runtime/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Dynamic.Runtime/tests/Configurations.props
+++ b/src/libraries/System.Dynamic.Runtime/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj b/src/libraries/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj
index 976ea31..636b5ab 100644 (file)
--- a/src/libraries/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj
+++ b/src/libraries/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>67,168,219,414,162,184,458,464,78,169,114,693,108,1981,649,109,1066,3021,3026,3002,3014,3022,660,661,429;xUnit1013</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <AssembliesBeingTested Include="Microsoft.CSharp" />

diff --git a/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln b/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln
index 1072c6d..ed1bcbc 100644 (file)
--- a/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln
+++ b/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln
@@ -31,22 +31,22 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {66BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {66BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {66BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {66BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {77BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {77BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {77BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {77BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {66BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {66BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {66BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {66BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {77BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {77BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {77BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {77BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Globalization.Calendars/ref/Configurations.props b/src/libraries/System.Globalization.Calendars/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Globalization.Calendars/ref/Configurations.props
+++ b/src/libraries/System.Globalization.Calendars/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj b/src/libraries/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj
index b0ad5e4..683934b 100644 (file)
--- a/src/libraries/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj
+++ b/src/libraries/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Globalization.Calendars.Forwards.cs" />

diff --git a/src/libraries/System.Globalization.Calendars/src/Configurations.props b/src/libraries/System.Globalization.Calendars/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Globalization.Calendars/src/Configurations.props
+++ b/src/libraries/System.Globalization.Calendars/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj b/src/libraries/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj
index 09aaac9..f6eae82 100644 (file)
--- a/src/libraries/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj
+++ b/src/libraries/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Globalization.Calendars</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Configurations.props b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Configurations.props
+++ b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj
index e458662..dc7ecb8 100644 (file)
--- a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj
+++ b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Globalization.Calendars/tests/Configurations.props b/src/libraries/System.Globalization.Calendars/tests/Configurations.props
index beb53a9..c50114d 100644 (file)
--- a/src/libraries/System.Globalization.Calendars/tests/Configurations.props
+++ b/src/libraries/System.Globalization.Calendars/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj b/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj
index e7cf25b..82656cd 100644 (file)
--- a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj
+++ b/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln b/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln
index 58ee124..861a479 100644 (file)
--- a/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln
+++ b/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {2B96AA10-84C0-4927-8611-8D2474B990E8}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {2B96AA10-84C0-4927-8611-8D2474B990E8}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {2B96AA10-84C0-4927-8611-8D2474B990E8}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {2B96AA10-84C0-4927-8611-8D2474B990E8}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {3634FAA3-A33E-406A-94EE-5611C6CC2810}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {3634FAA3-A33E-406A-94EE-5611C6CC2810}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {3634FAA3-A33E-406A-94EE-5611C6CC2810}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {3634FAA3-A33E-406A-94EE-5611C6CC2810}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {2B96AA10-84C0-4927-8611-8D2474B990E8}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {2B96AA10-84C0-4927-8611-8D2474B990E8}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {2B96AA10-84C0-4927-8611-8D2474B990E8}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {2B96AA10-84C0-4927-8611-8D2474B990E8}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {3634FAA3-A33E-406A-94EE-5611C6CC2810}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {3634FAA3-A33E-406A-94EE-5611C6CC2810}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {3634FAA3-A33E-406A-94EE-5611C6CC2810}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {3634FAA3-A33E-406A-94EE-5611C6CC2810}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Globalization.Extensions/ref/Configurations.props b/src/libraries/System.Globalization.Extensions/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Globalization.Extensions/ref/Configurations.props
+++ b/src/libraries/System.Globalization.Extensions/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj b/src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj
index 7fcfaed..9132aa8 100644 (file)
--- a/src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj
+++ b/src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Globalization.Extensions.Forwards.cs" />

diff --git a/src/libraries/System.Globalization.Extensions/src/Configurations.props b/src/libraries/System.Globalization.Extensions/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.Globalization.Extensions/src/Configurations.props
+++ b/src/libraries/System.Globalization.Extensions/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj b/src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj
index 03fb60f..722461d 100644 (file)
--- a/src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj
+++ b/src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>System.Globalization.Extensions</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Runtime" />

diff --git a/src/libraries/System.Globalization.Extensions/tests/Configurations.props b/src/libraries/System.Globalization.Extensions/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Globalization.Extensions/tests/Configurations.props
+++ b/src/libraries/System.Globalization.Extensions/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj b/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj
index 2c326b8..14e35b6 100644 (file)
--- a/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj
+++ b/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Globalization/System.Globalization.sln b/src/libraries/System.Globalization/System.Globalization.sln
index fa0df39..084a2f7 100644 (file)
--- a/src/libraries/System.Globalization/System.Globalization.sln
+++ b/src/libraries/System.Globalization/System.Globalization.sln
@@ -31,22 +31,22 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {E1E58C98-808F-4065-9C1D-E6411166AF6F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {E1E58C98-808F-4065-9C1D-E6411166AF6F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {E1E58C98-808F-4065-9C1D-E6411166AF6F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {E1E58C98-808F-4065-9C1D-E6411166AF6F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {E1E58C98-808F-4065-9C1D-E6411166AF6F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {E1E58C98-808F-4065-9C1D-E6411166AF6F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {E1E58C98-808F-4065-9C1D-E6411166AF6F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {E1E58C98-808F-4065-9C1D-E6411166AF6F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Globalization/ref/Configurations.props b/src/libraries/System.Globalization/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Globalization/ref/Configurations.props
+++ b/src/libraries/System.Globalization/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Globalization/ref/System.Globalization.csproj b/src/libraries/System.Globalization/ref/System.Globalization.csproj
index a9f6d99..8a81692 100644 (file)
--- a/src/libraries/System.Globalization/ref/System.Globalization.csproj
+++ b/src/libraries/System.Globalization/ref/System.Globalization.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Globalization.Forwards.cs" />

diff --git a/src/libraries/System.Globalization/src/Configurations.props b/src/libraries/System.Globalization/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Globalization/src/Configurations.props
+++ b/src/libraries/System.Globalization/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Globalization/src/System.Globalization.csproj b/src/libraries/System.Globalization/src/System.Globalization.csproj
index d29735d..cb7009c 100644 (file)
--- a/src/libraries/System.Globalization/src/System.Globalization.csproj
+++ b/src/libraries/System.Globalization/src/System.Globalization.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Globalization</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Globalization/tests/Configurations.props b/src/libraries/System.Globalization/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Globalization/tests/Configurations.props
+++ b/src/libraries/System.Globalization/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Globalization/tests/Invariant/Configurations.props b/src/libraries/System.Globalization/tests/Invariant/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Globalization/tests/Invariant/Configurations.props
+++ b/src/libraries/System.Globalization/tests/Invariant/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj b/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj
index 00292d2..4cc696c 100644 (file)
--- a/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj
+++ b/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
index 9d36854..d5dcfcd 100644 (file)
--- a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
+++ b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CompareInfo\CompareInfoTests.cs" />

diff --git a/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln b/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln
index 92298d1..bd33a94 100644 (file)
--- a/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln
+++ b/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {5471BFE8-8071-466F-838E-5ADAA779E742}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {5471BFE8-8071-466F-838E-5ADAA779E742}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {5471BFE8-8071-466F-838E-5ADAA779E742}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {5471BFE8-8071-466F-838E-5ADAA779E742}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5471BFE8-8071-466F-838E-5ADAA779E742}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5471BFE8-8071-466F-838E-5ADAA779E742}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5471BFE8-8071-466F-838E-5ADAA779E742}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5471BFE8-8071-466F-838E-5ADAA779E742}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.IO.Compression.Brotli/ref/Configurations.props b/src/libraries/System.IO.Compression.Brotli/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.Compression.Brotli/ref/Configurations.props
+++ b/src/libraries/System.IO.Compression.Brotli/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Compression.Brotli/ref/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/ref/System.IO.Compression.Brotli.csproj
index 5dd8401..b241a21 100644 (file)
--- a/src/libraries/System.IO.Compression.Brotli/ref/System.IO.Compression.Brotli.csproj
+++ b/src/libraries/System.IO.Compression.Brotli/ref/System.IO.Compression.Brotli.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.Compression.Brotli.cs" />

diff --git a/src/libraries/System.IO.Compression.Brotli/src/Configurations.props b/src/libraries/System.IO.Compression.Brotli/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.IO.Compression.Brotli/src/Configurations.props
+++ b/src/libraries/System.IO.Compression.Brotli/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
index a13db20..72f8390 100644 (file)
--- a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
+++ b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
@@ -4,7 +4,7 @@
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <!-- Platform agnostic files -->

diff --git a/src/libraries/System.IO.Compression.Brotli/tests/Configurations.props b/src/libraries/System.IO.Compression.Brotli/tests/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.IO.Compression.Brotli/tests/Configurations.props
+++ b/src/libraries/System.IO.Compression.Brotli/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
index 59838b7..699eef5 100644 (file)
--- a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
+++ b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants Condition="'$(TargetsNetCoreApp)' == 'true'">$(DefineConstants);STREAM_MEMORY_OVERLOADS_AVAILABLE</DefineConstants>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BrotliEncoderTests.cs" />

diff --git a/src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln b/src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln
index 365cee4..25dfde9 100644 (file)
--- a/src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln
+++ b/src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {775727A6-DF41-4160-A7FD-180279A653C7}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {775727A6-DF41-4160-A7FD-180279A653C7}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {775727A6-DF41-4160-A7FD-180279A653C7}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {775727A6-DF41-4160-A7FD-180279A653C7}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {ACF967ED-7FC9-435C-B2C9-306626B7B6C6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {ACF967ED-7FC9-435C-B2C9-306626B7B6C6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {ACF967ED-7FC9-435C-B2C9-306626B7B6C6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {ACF967ED-7FC9-435C-B2C9-306626B7B6C6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {775727A6-DF41-4160-A7FD-180279A653C7}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {775727A6-DF41-4160-A7FD-180279A653C7}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {775727A6-DF41-4160-A7FD-180279A653C7}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {775727A6-DF41-4160-A7FD-180279A653C7}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {ACF967ED-7FC9-435C-B2C9-306626B7B6C6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {ACF967ED-7FC9-435C-B2C9-306626B7B6C6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {ACF967ED-7FC9-435C-B2C9-306626B7B6C6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {ACF967ED-7FC9-435C-B2C9-306626B7B6C6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.IO.Compression.ZipFile/ref/Configurations.props b/src/libraries/System.IO.Compression.ZipFile/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.Compression.ZipFile/ref/Configurations.props
+++ b/src/libraries/System.IO.Compression.ZipFile/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj b/src/libraries/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj
index dff22c4..6eb1316 100644 (file)
--- a/src/libraries/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj
+++ b/src/libraries/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.Compression.ZipFile.cs" />

diff --git a/src/libraries/System.IO.Compression.ZipFile/src/Configurations.props b/src/libraries/System.IO.Compression.ZipFile/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.Compression.ZipFile/src/Configurations.props
+++ b/src/libraries/System.IO.Compression.ZipFile/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj b/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
index e4e0c5a..09c9f31 100644 (file)
--- a/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
+++ b/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.IO.Compression.ZipFile</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <ItemGroup>

diff --git a/src/libraries/System.IO.Compression.ZipFile/tests/Configurations.props b/src/libraries/System.IO.Compression.ZipFile/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.Compression.ZipFile/tests/Configurations.props
+++ b/src/libraries/System.IO.Compression.ZipFile/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj b/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj
index 41c1838..be319c4 100644 (file)
--- a/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj
+++ b/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ZipFile.Create.cs" />

diff --git a/src/libraries/System.IO.Compression/System.IO.Compression.sln b/src/libraries/System.IO.Compression/System.IO.Compression.sln
index 56dddb1..c12272e 100644 (file)
--- a/src/libraries/System.IO.Compression/System.IO.Compression.sln
+++ b/src/libraries/System.IO.Compression/System.IO.Compression.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {17DA7FB5-4370-4385-9A02-FFEF9F482903}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {17DA7FB5-4370-4385-9A02-FFEF9F482903}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {17DA7FB5-4370-4385-9A02-FFEF9F482903}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {17DA7FB5-4370-4385-9A02-FFEF9F482903}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {17DA7FB5-4370-4385-9A02-FFEF9F482903}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {17DA7FB5-4370-4385-9A02-FFEF9F482903}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {17DA7FB5-4370-4385-9A02-FFEF9F482903}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {17DA7FB5-4370-4385-9A02-FFEF9F482903}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.IO.Compression/ref/Configurations.props b/src/libraries/System.IO.Compression/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.Compression/ref/Configurations.props
+++ b/src/libraries/System.IO.Compression/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Compression/ref/System.IO.Compression.csproj b/src/libraries/System.IO.Compression/ref/System.IO.Compression.csproj
index 40de8f5..7f549dc 100644 (file)
--- a/src/libraries/System.IO.Compression/ref/System.IO.Compression.csproj
+++ b/src/libraries/System.IO.Compression/ref/System.IO.Compression.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.IO.Compression/src/Configurations.props b/src/libraries/System.IO.Compression/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.IO.Compression/src/Configurations.props
+++ b/src/libraries/System.IO.Compression/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
index b98f947..c344326 100644 (file)
--- a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
+++ b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.IO.Compression</AssemblyName>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->

diff --git a/src/libraries/System.IO.Compression/tests/Configurations.props b/src/libraries/System.IO.Compression/tests/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.IO.Compression/tests/Configurations.props
+++ b/src/libraries/System.IO.Compression/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
index 908bad8..bc96746 100644 (file)
--- a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
+++ b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- This constant is only here for usage in $(CommonTestPath), since not all projects using these tests have been updated yet-->
     <DefineConstants>$(DefineConstants);STREAM_MEMORY_OVERLOADS_AVAILABLE</DefineConstants>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CompressionStreamUnitTests.Deflate.cs" />

diff --git a/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln b/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln
index e4e3294..18ee411 100644 (file)
--- a/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln
+++ b/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {88A04AB0-F61E-4DD2-9E12-928DCA261263}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {88A04AB0-F61E-4DD2-9E12-928DCA261263}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {88A04AB0-F61E-4DD2-9E12-928DCA261263}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/Configurations.props b/src/libraries/System.IO.FileSystem.AccessControl/ref/Configurations.props
index d45a867..3f9144e 100644 (file)
--- a/src/libraries/System.IO.FileSystem.AccessControl/ref/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.AccessControl/ref/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netfx;
+      $(NetFrameworkCurrent);
       net461;
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj
index ac05089..dbc2ca8 100644 (file)
--- a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj
+++ b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Debug;net461-Release;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Debug;net461-Release;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.FileSystem.AccessControl.cs" />

diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/Configurations.props b/src/libraries/System.IO.FileSystem.AccessControl/src/Configurations.props
index 1592bf1..9bfc9e6 100644 (file)
--- a/src/libraries/System.IO.FileSystem.AccessControl/src/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.AccessControl/src/Configurations.props
@@ -7,8 +7,8 @@
   </PackageConfigurations>
   <BuildConfigurations>
     $(PackageConfigurations);
-    netcoreapp-Windows_NT;
-    netfx-Windows_NT;
+    $(NetCoreAppCurrent)-Windows_NT;
+    $(NetFrameworkCurrent)-Windows_NT;
   </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj
index 8361029..65f2e76 100644 (file)
--- a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj
+++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks Condition="'$(TargetsWindows)' == 'true'">true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
     <Nullable>annotations</Nullable>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' != 'true'">

diff --git a/src/libraries/System.IO.FileSystem.AccessControl/tests/Configurations.props b/src/libraries/System.IO.FileSystem.AccessControl/tests/Configurations.props
index c84dc3c..3728310 100644 (file)
--- a/src/libraries/System.IO.FileSystem.AccessControl/tests/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.AccessControl/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj
index 99ab793..17e9d5c 100644 (file)
--- a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DirectoryObjectSecurityTests.cs" />

diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln b/src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln
index 199df55..de096fd 100644 (file)
--- a/src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {29C14AD7-DC03-45DC-897D-8DACC762707E}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {29C14AD7-DC03-45DC-897D-8DACC762707E}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {29C14AD7-DC03-45DC-897D-8DACC762707E}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {29C14AD7-DC03-45DC-897D-8DACC762707E}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {48CD5889-4CB2-42C2-A61C-8ECA3B267584}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {48CD5889-4CB2-42C2-A61C-8ECA3B267584}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {48CD5889-4CB2-42C2-A61C-8ECA3B267584}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {48CD5889-4CB2-42C2-A61C-8ECA3B267584}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {29C14AD7-DC03-45DC-897D-8DACC762707E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {29C14AD7-DC03-45DC-897D-8DACC762707E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {29C14AD7-DC03-45DC-897D-8DACC762707E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {29C14AD7-DC03-45DC-897D-8DACC762707E}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {48CD5889-4CB2-42C2-A61C-8ECA3B267584}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {48CD5889-4CB2-42C2-A61C-8ECA3B267584}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {48CD5889-4CB2-42C2-A61C-8ECA3B267584}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {48CD5889-4CB2-42C2-A61C-8ECA3B267584}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/ref/Configurations.props b/src/libraries/System.IO.FileSystem.DriveInfo/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.FileSystem.DriveInfo/ref/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj
index 2027e87..caa3534 100644 (file)
--- a/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.FileSystem.DriveInfo.cs" />

diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/Configurations.props b/src/libraries/System.IO.FileSystem.DriveInfo/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.IO.FileSystem.DriveInfo/src/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
index cd18c3f..3d20d06 100644 (file)
--- a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
@@ -3,8 +3,8 @@
     <RootNamespace>System.IO.FileSystem.DriveInfo</RootNamespace>
     <AssemblyName>System.IO.FileSystem.DriveInfo</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\IO\DriveInfo.cs" />
@@ -69,7 +69,7 @@
       <Link>Common\System\IO\PathInternal.Windows.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == 'netcoreapp' ">
+  <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == '$(NetCoreAppCurrent)' ">
     <Compile Include="System\IO\DriveInfo.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
       <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>

diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/tests/Configurations.props b/src/libraries/System.IO.FileSystem.DriveInfo/tests/Configurations.props
index 7e12b46..c31cf2a 100644 (file)
--- a/src/libraries/System.IO.FileSystem.DriveInfo/tests/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
index 8a1f2f3..cccf5f4 100644 (file)
--- a/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DriveInfo.Unix.Tests.cs" Condition="'$(TargetsUnix)' == 'true'" />

diff --git a/src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln b/src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln
index 1ba575b..dac0cbc 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln
+++ b/src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {6C05678E-394C-4CFF-B453-A18E28C8F2C3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6C05678E-394C-4CFF-B453-A18E28C8F2C3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6C05678E-394C-4CFF-B453-A18E28C8F2C3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6C05678E-394C-4CFF-B453-A18E28C8F2C3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {45201E24-47CD-47AE-9350-B48C3FBE74EC}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {45201E24-47CD-47AE-9350-B48C3FBE74EC}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {45201E24-47CD-47AE-9350-B48C3FBE74EC}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {45201E24-47CD-47AE-9350-B48C3FBE74EC}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {6C05678E-394C-4CFF-B453-A18E28C8F2C3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6C05678E-394C-4CFF-B453-A18E28C8F2C3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6C05678E-394C-4CFF-B453-A18E28C8F2C3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6C05678E-394C-4CFF-B453-A18E28C8F2C3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {45201E24-47CD-47AE-9350-B48C3FBE74EC}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {45201E24-47CD-47AE-9350-B48C3FBE74EC}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {45201E24-47CD-47AE-9350-B48C3FBE74EC}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {45201E24-47CD-47AE-9350-B48C3FBE74EC}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.IO.FileSystem.Primitives/ref/Configurations.props b/src/libraries/System.IO.FileSystem.Primitives/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Primitives/ref/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.Primitives/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj b/src/libraries/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj
index 30b24f2..51522ce 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj
+++ b/src/libraries/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.FileSystem.Primitives.cs" />

diff --git a/src/libraries/System.IO.FileSystem.Primitives/src/Configurations.props b/src/libraries/System.IO.FileSystem.Primitives/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Primitives/src/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.Primitives/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj b/src/libraries/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj
index 9987d32..bbf4124 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj
+++ b/src/libraries/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.IO.FileSystem.Primitives</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Runtime" />

diff --git a/src/libraries/System.IO.FileSystem.Primitives/tests/Configurations.props b/src/libraries/System.IO.FileSystem.Primitives/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Primitives/tests/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.Primitives/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj b/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj
index 53b7df5..2859a2f 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln b/src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln
index 72fec8e..e682415 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln
+++ b/src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {20411A66-C7A4-4941-8FA2-66308365FD22}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {20411A66-C7A4-4941-8FA2-66308365FD22}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {20411A66-C7A4-4941-8FA2-66308365FD22}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {20411A66-C7A4-4941-8FA2-66308365FD22}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {77E702D9-C6D8-4CE4-9941-D3056C3CCBED}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {77E702D9-C6D8-4CE4-9941-D3056C3CCBED}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {77E702D9-C6D8-4CE4-9941-D3056C3CCBED}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {77E702D9-C6D8-4CE4-9941-D3056C3CCBED}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {34E2C0E2-6C09-427D-BB75-702B3388CFC5}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {34E2C0E2-6C09-427D-BB75-702B3388CFC5}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {34E2C0E2-6C09-427D-BB75-702B3388CFC5}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {34E2C0E2-6C09-427D-BB75-702B3388CFC5}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {20411A66-C7A4-4941-8FA2-66308365FD22}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {20411A66-C7A4-4941-8FA2-66308365FD22}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {20411A66-C7A4-4941-8FA2-66308365FD22}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {20411A66-C7A4-4941-8FA2-66308365FD22}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {77E702D9-C6D8-4CE4-9941-D3056C3CCBED}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {77E702D9-C6D8-4CE4-9941-D3056C3CCBED}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {77E702D9-C6D8-4CE4-9941-D3056C3CCBED}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {77E702D9-C6D8-4CE4-9941-D3056C3CCBED}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {34E2C0E2-6C09-427D-BB75-702B3388CFC5}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {34E2C0E2-6C09-427D-BB75-702B3388CFC5}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {34E2C0E2-6C09-427D-BB75-702B3388CFC5}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {34E2C0E2-6C09-427D-BB75-702B3388CFC5}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.IO.FileSystem.Watcher/ref/Configurations.props b/src/libraries/System.IO.FileSystem.Watcher/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Watcher/ref/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.Watcher/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj
index c0ad246..e14d3f4 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.FileSystem.Watcher.cs" />

diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/Configurations.props b/src/libraries/System.IO.FileSystem.Watcher/src/Configurations.props
index d23e9c1..d785c0b 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Watcher/src/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.Watcher/src/Configurations.props
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Linux;
-      netcoreapp-OSX;
-      netcoreapp-FreeBSD;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Linux;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-FreeBSD;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
index 154aea6..28dc72e 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Configurations>$(NetCoreAppCurrent)-FreeBSD-Debug;$(NetCoreAppCurrent)-FreeBSD-Release;$(NetCoreAppCurrent)-Linux-Debug;$(NetCoreAppCurrent)-Linux-Release;$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-FreeBSD-Debug;netcoreapp-FreeBSD-Release;netcoreapp-Linux-Debug;netcoreapp-Linux-Release;netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\HResults.cs" />

diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/Configurations.props b/src/libraries/System.IO.FileSystem.Watcher/tests/Configurations.props
index d23e9c1..d785c0b 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Watcher/tests/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.Watcher/tests/Configurations.props
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Linux;
-      netcoreapp-OSX;
-      netcoreapp-FreeBSD;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Linux;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-FreeBSD;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
index 102bf2a..fb0c8de 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Linux-Debug;netcoreapp-Linux-Release;netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcore-FreeBSD-Debug;netcore-FreeBSD-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Linux-Debug;$(NetCoreAppCurrent)-Linux-Release;$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcore-FreeBSD-Debug;netcore-FreeBSD-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FileSystemWatcher.cs" />

diff --git a/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln b/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln
index 42726a5..5388791 100644 (file)
--- a/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln
+++ b/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {1B528B61-14F9-4BFC-A79A-F0BDB3339150}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {1B528B61-14F9-4BFC-A79A-F0BDB3339150}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {1B528B61-14F9-4BFC-A79A-F0BDB3339150}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {1B528B61-14F9-4BFC-A79A-F0BDB3339150}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {1B528B61-14F9-4BFC-A79A-F0BDB3339150}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {1B528B61-14F9-4BFC-A79A-F0BDB3339150}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {1B528B61-14F9-4BFC-A79A-F0BDB3339150}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {1B528B61-14F9-4BFC-A79A-F0BDB3339150}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.IO.FileSystem/ref/Configurations.props b/src/libraries/System.IO.FileSystem/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.FileSystem/ref/Configurations.props
+++ b/src/libraries/System.IO.FileSystem/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.csproj b/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.csproj
index 58940b1..12019c6 100644 (file)
--- a/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.csproj
+++ b/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.IO.FileSystem/src/Configurations.props b/src/libraries/System.IO.FileSystem/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.IO.FileSystem/src/Configurations.props
+++ b/src/libraries/System.IO.FileSystem/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj
index 5941d5e..1ac2b82 100644 (file)
--- a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj
+++ b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573</NoWarn>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetsUnix)' == 'true'">

diff --git a/src/libraries/System.IO.FileSystem/tests/Configurations.props b/src/libraries/System.IO.FileSystem/tests/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.IO.FileSystem/tests/Configurations.props
+++ b/src/libraries/System.IO.FileSystem/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
index abd5c83..81ce3af 100644 (file)
--- a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Base\BaseGetSetAttributes.cs" />

diff --git a/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln b/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
index 8aef26f..592ad4f 100644 (file)
--- a/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
+++ b/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {FAF5D1E4-BA43-4663-8429-C069066D75CB}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {FAF5D1E4-BA43-4663-8429-C069066D75CB}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {FAF5D1E4-BA43-4663-8429-C069066D75CB}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {FAF5D1E4-BA43-4663-8429-C069066D75CB}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {750200D5-661A-42AA-9E1F-2A151F5AEE74}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {750200D5-661A-42AA-9E1F-2A151F5AEE74}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {750200D5-661A-42AA-9E1F-2A151F5AEE74}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {750200D5-661A-42AA-9E1F-2A151F5AEE74}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {FAF5D1E4-BA43-4663-8429-C069066D75CB}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {FAF5D1E4-BA43-4663-8429-C069066D75CB}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {FAF5D1E4-BA43-4663-8429-C069066D75CB}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {FAF5D1E4-BA43-4663-8429-C069066D75CB}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {750200D5-661A-42AA-9E1F-2A151F5AEE74}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {750200D5-661A-42AA-9E1F-2A151F5AEE74}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {750200D5-661A-42AA-9E1F-2A151F5AEE74}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {750200D5-661A-42AA-9E1F-2A151F5AEE74}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.IO.IsolatedStorage/ref/Configurations.props b/src/libraries/System.IO.IsolatedStorage/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.IsolatedStorage/ref/Configurations.props
+++ b/src/libraries/System.IO.IsolatedStorage/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj
index f4d130c..4189232 100644 (file)
--- a/src/libraries/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj
+++ b/src/libraries/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.IsolatedStorage.cs" />

diff --git a/src/libraries/System.IO.IsolatedStorage/src/Configurations.props b/src/libraries/System.IO.IsolatedStorage/src/Configurations.props
index 6a1e7c2..5ddac46 100644 (file)
--- a/src/libraries/System.IO.IsolatedStorage/src/Configurations.props
+++ b/src/libraries/System.IO.IsolatedStorage/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>      
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
index 14d1313..3e2ead7 100644 (file)
--- a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
+++ b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\IO\IsolatedStorage\IsolatedStorageException.cs" />

diff --git a/src/libraries/System.IO.IsolatedStorage/tests/Configurations.props b/src/libraries/System.IO.IsolatedStorage/tests/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.IO.IsolatedStorage/tests/Configurations.props
+++ b/src/libraries/System.IO.IsolatedStorage/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj
index be07714..2a5a220 100644 (file)
--- a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj
+++ b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\IO\IsolatedStorage\IdentityTests.cs" />

diff --git a/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln b/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
index 5396e51..a5c4eba 100644 (file)
--- a/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
+++ b/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {16EE5522-F387-4C9E-9EF2-B5134B043F37}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {16EE5522-F387-4C9E-9EF2-B5134B043F37}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {16EE5522-F387-4C9E-9EF2-B5134B043F37}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {16EE5522-F387-4C9E-9EF2-B5134B043F37}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F2740000-E771-4E54-9287-5A1FDF8872F4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F2740000-E771-4E54-9287-5A1FDF8872F4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F2740000-E771-4E54-9287-5A1FDF8872F4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F2740000-E771-4E54-9287-5A1FDF8872F4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {16EE5522-F387-4C9E-9EF2-B5134B043F37}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {16EE5522-F387-4C9E-9EF2-B5134B043F37}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {16EE5522-F387-4C9E-9EF2-B5134B043F37}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {16EE5522-F387-4C9E-9EF2-B5134B043F37}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F2740000-E771-4E54-9287-5A1FDF8872F4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F2740000-E771-4E54-9287-5A1FDF8872F4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F2740000-E771-4E54-9287-5A1FDF8872F4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F2740000-E771-4E54-9287-5A1FDF8872F4}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.IO.MemoryMappedFiles/ref/Configurations.props b/src/libraries/System.IO.MemoryMappedFiles/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.MemoryMappedFiles/ref/Configurations.props
+++ b/src/libraries/System.IO.MemoryMappedFiles/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj b/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj
index 7599933..db040f8 100644 (file)
--- a/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj
+++ b/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.MemoryMappedFiles.cs" />

diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/Configurations.props b/src/libraries/System.IO.MemoryMappedFiles/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.IO.MemoryMappedFiles/src/Configurations.props
+++ b/src/libraries/System.IO.MemoryMappedFiles/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
index 351c959..756d349 100644 (file)
--- a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
+++ b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.IO.MemoryMappedFiles</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <!-- Compiled Source Files -->
   <ItemGroup>

diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/Configurations.props b/src/libraries/System.IO.MemoryMappedFiles/tests/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.IO.MemoryMappedFiles/tests/Configurations.props
+++ b/src/libraries/System.IO.MemoryMappedFiles/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
index 3643db1..88b5bbb 100644 (file)
--- a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
+++ b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="MemoryMappedFile.CreateFromFile.Tests.cs" />

diff --git a/src/libraries/System.IO.Packaging/System.IO.Packaging.sln b/src/libraries/System.IO.Packaging/System.IO.Packaging.sln
index 9c3bafb..b615a0c 100644 (file)
--- a/src/libraries/System.IO.Packaging/System.IO.Packaging.sln
+++ b/src/libraries/System.IO.Packaging/System.IO.Packaging.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {1F827C19-6023-48D3-909F-9F43AB42FAF0}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {1F827C19-6023-48D3-909F-9F43AB42FAF0}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {1F827C19-6023-48D3-909F-9F43AB42FAF0}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.IO.Packaging/ref/Configurations.props b/src/libraries/System.IO.Packaging/ref/Configurations.props
index 45236a6..0975fa8 100644 (file)
--- a/src/libraries/System.IO.Packaging/ref/Configurations.props
+++ b/src/libraries/System.IO.Packaging/ref/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj
index cecaf0c..8e0b819 100644 (file)
--- a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj
+++ b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx' or '$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
+    <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == '$(NetFrameworkCurrent)' or '$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <DefineConstants Condition="'$(TargetGroup)'=='netstandard1.3'">$(DefineConstants);netcoreapp</DefineConstants>
-    <Configurations>net46-Debug;net46-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
+    <Configurations>net46-Debug;net46-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.Packaging.cs" />
@@ -11,7 +11,7 @@
     <Compile Include="System.IO.Packaging.Serialization.cs" />
     <Compile Include="System.IO.Packaging.PackUriScheme.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netfx' or '$(TargetGroup)' == 'net46'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetFrameworkCurrent)' or '$(TargetGroup)' == 'net46'">
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="WindowsBase" />

diff --git a/src/libraries/System.IO.Packaging/src/Configurations.props b/src/libraries/System.IO.Packaging/src/Configurations.props
index c8d2568..d151f62 100644 (file)
--- a/src/libraries/System.IO.Packaging/src/Configurations.props
+++ b/src/libraries/System.IO.Packaging/src/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj b/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj
index 28f890b..b41ac06 100644 (file)
--- a/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj
+++ b/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj
@@ -3,9 +3,9 @@
     <RootNamespace>System.IO.Packaging</RootNamespace>
     <AssemblyName>System.IO.Packaging</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx' or '$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
+    <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='$(NetFrameworkCurrent)' or '$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
     <DefineConstants Condition="'$(TargetGroup)' != 'netstandard1.3'">$(DefineConstants);FEATURE_SERIALIZATION</DefineConstants>
-    <Configurations>net46-Debug;net46-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
+    <Configurations>net46-Debug;net46-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.3'">
     <Reference Include="System.Collections" />
@@ -51,7 +51,7 @@
     <Compile Include="System\IO\Packaging\ZipWrappingStream.cs" />
     <Compile Condition="'$(TargetGroup)'!='netstandard1.3'" Include="System\IO\Packaging\PackUriHelper.PackUriScheme.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)'=='netfx' or '$(TargetGroup)' == 'net46' ">
+  <ItemGroup Condition="'$(TargetGroup)'=='$(NetFrameworkCurrent)' or '$(TargetGroup)' == 'net46' ">
     <Reference Include="mscorlib" />
     <Reference Include="WindowsBase" />
   </ItemGroup>

diff --git a/src/libraries/System.IO.Packaging/tests/Configurations.props b/src/libraries/System.IO.Packaging/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.IO.Packaging/tests/Configurations.props
+++ b/src/libraries/System.IO.Packaging/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj b/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj
index 759191c..37e05c2 100644 (file)
--- a/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj
+++ b/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Tests.cs" />

diff --git a/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln b/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln
index 9123a7d..00ddd52 100644 (file)
--- a/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln
+++ b/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {9C524CA0-92FF-437B-B568-BCE8A794A69A}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {9C524CA0-92FF-437B-B568-BCE8A794A69A}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {9C524CA0-92FF-437B-B568-BCE8A794A69A}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.IO.Pipelines/src/Configurations.props b/src/libraries/System.IO.Pipelines/src/Configurations.props
index e19e870..724ad56 100644 (file)
--- a/src/libraries/System.IO.Pipelines/src/Configurations.props
+++ b/src/libraries/System.IO.Pipelines/src/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj
index 57da081..84019bd 100644 (file)
--- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj
+++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.IO.Pipelines/tests/Configurations.props b/src/libraries/System.IO.Pipelines/tests/Configurations.props
index 7538cfb..4d7a02a 100644 (file)
--- a/src/libraries/System.IO.Pipelines/tests/Configurations.props
+++ b/src/libraries/System.IO.Pipelines/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj b/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj
index 76efb2d..e526bbf 100644 (file)
--- a/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj
+++ b/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
     <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. -->

diff --git a/src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln b/src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln
index 8f46da6..ad46274 100644 (file)
--- a/src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln
+++ b/src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A0356E61-19E1-4722-A53D-5D2616E16312}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {A0356E61-19E1-4722-A53D-5D2616E16312}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {A0356E61-19E1-4722-A53D-5D2616E16312}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {A0356E61-19E1-4722-A53D-5D2616E16312}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {A0356E61-19E1-4722-A53D-5D2616E16312}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A0356E61-19E1-4722-A53D-5D2616E16312}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A0356E61-19E1-4722-A53D-5D2616E16312}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {A0356E61-19E1-4722-A53D-5D2616E16312}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {994DCE47-4CF6-479D-AB1D-4EA6A2809C34}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {994DCE47-4CF6-479D-AB1D-4EA6A2809C34}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {994DCE47-4CF6-479D-AB1D-4EA6A2809C34}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/Configurations.props b/src/libraries/System.IO.Pipes.AccessControl/src/Configurations.props
index 805bd98..3d43aee 100644 (file)
--- a/src/libraries/System.IO.Pipes.AccessControl/src/Configurations.props
+++ b/src/libraries/System.IO.Pipes.AccessControl/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project> 
\ No newline at end of file

diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj
index 664f982..00ed020 100644 (file)
--- a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj
+++ b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj
@@ -5,7 +5,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetsWindows)' == 'true'">true</IsPartialFacadeAssembly>
     <OmitResources Condition="'$(TargetsWindows)' == 'true'">true</OmitResources>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Runtime" />

diff --git a/src/libraries/System.IO.Pipes.AccessControl/tests/Configurations.props b/src/libraries/System.IO.Pipes.AccessControl/tests/Configurations.props
index d594d8a..537af9a 100644 (file)
--- a/src/libraries/System.IO.Pipes.AccessControl/tests/Configurations.props
+++ b/src/libraries/System.IO.Pipes.AccessControl/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj b/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj
index 30fdc15..327a0ff 100644 (file)
--- a/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj
+++ b/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <AssembliesBeingTested Include="System.IO.Pipes" />

diff --git a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln
index e8bd0df..9c1a62d 100644 (file)
--- a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln
+++ b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {142469EC-D665-4FE2-845A-FDA69F9CC557}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {142469EC-D665-4FE2-845A-FDA69F9CC557}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {142469EC-D665-4FE2-845A-FDA69F9CC557}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {142469EC-D665-4FE2-845A-FDA69F9CC557}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {38B2B275-FB29-45C6-9E68-9ECEBC6BD874}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {38B2B275-FB29-45C6-9E68-9ECEBC6BD874}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {38B2B275-FB29-45C6-9E68-9ECEBC6BD874}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {38B2B275-FB29-45C6-9E68-9ECEBC6BD874}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {142469EC-D665-4FE2-845A-FDA69F9CC557}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {142469EC-D665-4FE2-845A-FDA69F9CC557}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {142469EC-D665-4FE2-845A-FDA69F9CC557}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {142469EC-D665-4FE2-845A-FDA69F9CC557}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {38B2B275-FB29-45C6-9E68-9ECEBC6BD874}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {38B2B275-FB29-45C6-9E68-9ECEBC6BD874}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {38B2B275-FB29-45C6-9E68-9ECEBC6BD874}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {38B2B275-FB29-45C6-9E68-9ECEBC6BD874}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.IO.Pipes/ref/Configurations.props b/src/libraries/System.IO.Pipes/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.Pipes/ref/Configurations.props
+++ b/src/libraries/System.IO.Pipes/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj
index 3ded1bf..7824dd9 100644 (file)
--- a/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj
+++ b/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.Pipes.cs" />

diff --git a/src/libraries/System.IO.Pipes/src/Configurations.props b/src/libraries/System.IO.Pipes/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.IO.Pipes/src/Configurations.props
+++ b/src/libraries/System.IO.Pipes/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
index c8b6fdd..411cb73 100644 (file)
--- a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
+++ b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.IO.Pipes</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OmitTransitiveCompileReferences>true</OmitTransitiveCompileReferences>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <!-- Compiled Source Files -->
   <ItemGroup>

diff --git a/src/libraries/System.IO.Pipes/tests/Configurations.props b/src/libraries/System.IO.Pipes/tests/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.IO.Pipes/tests/Configurations.props
+++ b/src/libraries/System.IO.Pipes/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
index a136cab..fc1a56e 100644 (file)
--- a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
+++ b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AnonymousPipeTests\AnonymousPipeTest.CreateServer.cs" />

diff --git a/src/libraries/System.IO.Ports/System.IO.Ports.sln b/src/libraries/System.IO.Ports/System.IO.Ports.sln
index 992c48b..94d9c52 100644 (file)
--- a/src/libraries/System.IO.Ports/System.IO.Ports.sln
+++ b/src/libraries/System.IO.Ports/System.IO.Ports.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {4259DCE9-3480-40BB-B08A-64A2D446264B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {4259DCE9-3480-40BB-B08A-64A2D446264B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {4259DCE9-3480-40BB-B08A-64A2D446264B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {4259DCE9-3480-40BB-B08A-64A2D446264B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {4259DCE9-3480-40BB-B08A-64A2D446264B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {4259DCE9-3480-40BB-B08A-64A2D446264B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {4259DCE9-3480-40BB-B08A-64A2D446264B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4259DCE9-3480-40BB-B08A-64A2D446264B}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {187503F4-BEF9-4369-A1B2-E3DC5D564E4E}.Debug|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Debug|Any CPU
                {187503F4-BEF9-4369-A1B2-E3DC5D564E4E}.Debug|Any CPU.Build.0 = netstandard2.0-Windows_NT-Debug|Any CPU
                {187503F4-BEF9-4369-A1B2-E3DC5D564E4E}.Release|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Release|Any CPU

diff --git a/src/libraries/System.IO.Ports/ref/Configurations.props b/src/libraries/System.IO.Ports/ref/Configurations.props
index 9a39f69..f2e4882 100644 (file)
--- a/src/libraries/System.IO.Ports/ref/Configurations.props
+++ b/src/libraries/System.IO.Ports/ref/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj
index a258b76..276078c 100644 (file)
--- a/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj
+++ b/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.Ports.cs" />

diff --git a/src/libraries/System.IO.Ports/src/Configurations.props b/src/libraries/System.IO.Ports/src/Configurations.props
index 06550b4..38b3c69 100644 (file)
--- a/src/libraries/System.IO.Ports/src/Configurations.props
+++ b/src/libraries/System.IO.Ports/src/Configurations.props
@@ -10,7 +10,7 @@
     <BuildConfigurations>
       $(PackageConfigurations)
       netstandard2.0-FreeBSD;
-      netfx-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
index dc94ef4..e9a6dab 100644 (file)
--- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
+++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
@@ -6,7 +6,7 @@
     <DefineConstants>$(DefineConstants);NOSPAN</DefineConstants>
     <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
     <Nullable>annotations</Nullable>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Linux-Debug;netstandard2.0-Linux-Release;netstandard2.0-OSX-Debug;netstandard2.0-OSX-Release;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Linux-Debug;netstandard2.0-Linux-Release;netstandard2.0-OSX-Debug;netstandard2.0-OSX-Release;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' == 'true' and '$(OSGroup)' != 'AnyOS'">
     <Compile Include="System\IO\Ports\Handshake.cs" />

diff --git a/src/libraries/System.IO.Ports/tests/Configurations.props b/src/libraries/System.IO.Ports/tests/Configurations.props
index 6a40cf6..1ab889d 100644 (file)
--- a/src/libraries/System.IO.Ports/tests/Configurations.props
+++ b/src/libraries/System.IO.Ports/tests/Configurations.props
@@ -1,11 +1,11 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Linux;
-      netcoreapp-OSX;
-      netcoreapp-FreeBSD;
-      netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Linux;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-FreeBSD;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj b/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj
index d65df94..7ce3e02 100644 (file)
--- a/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj
+++ b/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Linux-Debug;netcoreapp-Linux-Release;netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Linux-Debug;$(NetCoreAppCurrent)-Linux-Release;$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />

diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln b/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln
index 1105c4c..2749cfb 100644 (file)
--- a/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {BCF9255A-4321-4277-AD7D-F5094092C554}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {BCF9255A-4321-4277-AD7D-F5094092C554}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {BCF9255A-4321-4277-AD7D-F5094092C554}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {BCF9255A-4321-4277-AD7D-F5094092C554}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {BCF9255A-4321-4277-AD7D-F5094092C554}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {BCF9255A-4321-4277-AD7D-F5094092C554}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {BCF9255A-4321-4277-AD7D-F5094092C554}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {BCF9255A-4321-4277-AD7D-F5094092C554}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/ref/Configurations.props b/src/libraries/System.IO.UnmanagedMemoryStream/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.UnmanagedMemoryStream/ref/Configurations.props
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj b/src/libraries/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj
index 1621790..16db853 100644 (file)
--- a/src/libraries/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.UnmanagedMemoryStream.cs" />

diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/src/Configurations.props b/src/libraries/System.IO.UnmanagedMemoryStream/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.IO.UnmanagedMemoryStream/src/Configurations.props
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj b/src/libraries/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj
index b11d028..bae20e9 100644 (file)
--- a/src/libraries/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.IO.UnmanagedMemoryStream</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/Configurations.props b/src/libraries/System.IO.UnmanagedMemoryStream/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO.UnmanagedMemoryStream/tests/Configurations.props
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj b/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj
index 6c23b90..9d0524f 100644 (file)
--- a/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.IO/System.IO.sln b/src/libraries/System.IO/System.IO.sln
index 9fcc875..427e3bf 100644 (file)
--- a/src/libraries/System.IO/System.IO.sln
+++ b/src/libraries/System.IO/System.IO.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {07390899-C8F6-4e83-A3A9-6867B8CB46A0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {07390899-C8F6-4e83-A3A9-6867B8CB46A0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {07390899-C8F6-4e83-A3A9-6867B8CB46A0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {07390899-C8F6-4e83-A3A9-6867B8CB46A0}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {88883C57-83BE-4E93-A363-4CFC716F248F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {88883C57-83BE-4E93-A363-4CFC716F248F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {88883C57-83BE-4E93-A363-4CFC716F248F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {88883C57-83BE-4E93-A363-4CFC716F248F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {07390899-C8F6-4e83-A3A9-6867B8CB46A0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {07390899-C8F6-4e83-A3A9-6867B8CB46A0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {07390899-C8F6-4e83-A3A9-6867B8CB46A0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {07390899-C8F6-4e83-A3A9-6867B8CB46A0}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {88883C57-83BE-4E93-A363-4CFC716F248F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {88883C57-83BE-4E93-A363-4CFC716F248F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {88883C57-83BE-4E93-A363-4CFC716F248F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {88883C57-83BE-4E93-A363-4CFC716F248F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.IO/ref/Configurations.props b/src/libraries/System.IO/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO/ref/Configurations.props
+++ b/src/libraries/System.IO/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO/ref/System.IO.csproj b/src/libraries/System.IO/ref/System.IO.csproj
index 82919c6..68f6922 100644 (file)
--- a/src/libraries/System.IO/ref/System.IO.csproj
+++ b/src/libraries/System.IO/ref/System.IO.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.Manual.cs" />

diff --git a/src/libraries/System.IO/src/Configurations.props b/src/libraries/System.IO/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO/src/Configurations.props
+++ b/src/libraries/System.IO/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO/src/System.IO.csproj b/src/libraries/System.IO/src/System.IO.csproj
index fc4390d..b205fb8 100644 (file)
--- a/src/libraries/System.IO/src/System.IO.csproj
+++ b/src/libraries/System.IO/src/System.IO.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.IO</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <ItemGroup>

diff --git a/src/libraries/System.IO/tests/Configurations.props b/src/libraries/System.IO/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.IO/tests/Configurations.props
+++ b/src/libraries/System.IO/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.IO/tests/System.IO.Tests.csproj b/src/libraries/System.IO/tests/System.IO.Tests.csproj
index 22f066e..d75b6bf 100644 (file)
--- a/src/libraries/System.IO/tests/System.IO.Tests.csproj
+++ b/src/libraries/System.IO/tests/System.IO.Tests.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="IndentedTextWriter.cs" />

diff --git a/src/libraries/System.Json/System.Json.sln b/src/libraries/System.Json/System.Json.sln
index 2cff5eb..64e284e 100644 (file)
--- a/src/libraries/System.Json/System.Json.sln
+++ b/src/libraries/System.Json/System.Json.sln
@@ -19,10 +19,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {B11B5B76-F583-44EA-A4B7-3ABD990594F6}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {B11B5B76-F583-44EA-A4B7-3ABD990594F6}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {B11B5B76-F583-44EA-A4B7-3ABD990594F6}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Json/tests/Configurations.props b/src/libraries/System.Json/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Json/tests/Configurations.props
+++ b/src/libraries/System.Json/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Json/tests/System.Json.Tests.csproj b/src/libraries/System.Json/tests/System.Json.Tests.csproj
index e50aa0b..78a9a6e 100644 (file)
--- a/src/libraries/System.Json/tests/System.Json.Tests.csproj
+++ b/src/libraries/System.Json/tests/System.Json.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Json\JsonArrayTests.cs" />

diff --git a/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln b/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln
index 0c1b9ac..dab0d87 100644 (file)
--- a/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln
+++ b/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {33B6ACE2-0B53-4054-8BF6-482F9E0E9427}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {33B6ACE2-0B53-4054-8BF6-482F9E0E9427}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {33B6ACE2-0B53-4054-8BF6-482F9E0E9427}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {33B6ACE2-0B53-4054-8BF6-482F9E0E9427}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {33B6ACE2-0B53-4054-8BF6-482F9E0E9427}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {33B6ACE2-0B53-4054-8BF6-482F9E0E9427}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {33B6ACE2-0B53-4054-8BF6-482F9E0E9427}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {33B6ACE2-0B53-4054-8BF6-482F9E0E9427}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Linq.Expressions/ref/Configurations.props b/src/libraries/System.Linq.Expressions/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Linq.Expressions/ref/Configurations.props
+++ b/src/libraries/System.Linq.Expressions/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.csproj b/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.csproj
index 0048bdc..b665f92 100644 (file)
--- a/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.csproj
+++ b/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Linq.Expressions.cs" />

diff --git a/src/libraries/System.Linq.Expressions/src/Configurations.props b/src/libraries/System.Linq.Expressions/src/Configurations.props
index 7e12b46..c31cf2a 100644 (file)
--- a/src/libraries/System.Linq.Expressions/src/Configurations.props
+++ b/src/libraries/System.Linq.Expressions/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
index b1fba0e..c4e9ba1 100644 (file)
--- a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
+++ b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Enabling the interpreter for RC1 in all builds, see https://github.com/dotnet/corefx/issues/4033 -->
     <FeatureInterpret>true</FeatureInterpret>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>System.Linq.Expressions</AssemblyName>

diff --git a/src/libraries/System.Linq.Expressions/tests/Configurations.props b/src/libraries/System.Linq.Expressions/tests/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.Linq.Expressions/tests/Configurations.props
+++ b/src/libraries/System.Linq.Expressions/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
index 1dd4394..03eca32 100644 (file)
--- a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
+++ b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
@@ -5,7 +5,7 @@
     <IsInterpreting>false</IsInterpreting>
     <DefineConstants Condition=" '$(IsInterpreting)' != 'true' ">$(DefineConstants);FEATURE_COMPILE</DefineConstants>
     <DefineConstants Condition=" '$(FeatureInterpret)' == 'true' ">$(DefineConstants);FEATURE_INTERPRET</DefineConstants>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <DefaultReferenceExclusions Include="System.Linq.Expressions" />

diff --git a/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln b/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln
index 2754713..e0bb69e 100644 (file)
--- a/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln
+++ b/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A7074928-82C3-4739-88FE-9B528977950C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A7074928-82C3-4739-88FE-9B528977950C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {670405FE-3828-436E-A668-A0F0B88B57A4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {670405FE-3828-436E-A668-A0F0B88B57A4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {670405FE-3828-436E-A668-A0F0B88B57A4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {670405FE-3828-436E-A668-A0F0B88B57A4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {A7074928-82C3-4739-88FE-9B528977950C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A7074928-82C3-4739-88FE-9B528977950C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {670405FE-3828-436E-A668-A0F0B88B57A4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {670405FE-3828-436E-A668-A0F0B88B57A4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {670405FE-3828-436E-A668-A0F0B88B57A4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {670405FE-3828-436E-A668-A0F0B88B57A4}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Linq.Parallel/ref/Configurations.props b/src/libraries/System.Linq.Parallel/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Linq.Parallel/ref/Configurations.props
+++ b/src/libraries/System.Linq.Parallel/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Linq.Parallel/ref/System.Linq.Parallel.csproj b/src/libraries/System.Linq.Parallel/ref/System.Linq.Parallel.csproj
index 8f37667..7d1ce06 100644 (file)
--- a/src/libraries/System.Linq.Parallel/ref/System.Linq.Parallel.csproj
+++ b/src/libraries/System.Linq.Parallel/ref/System.Linq.Parallel.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Linq.Parallel/src/Configurations.props b/src/libraries/System.Linq.Parallel/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Linq.Parallel/src/Configurations.props
+++ b/src/libraries/System.Linq.Parallel/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj b/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj
index a87011f..35d36fd 100644 (file)
--- a/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj
+++ b/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Linq.Parallel</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
        <Nullable>enable</Nullable>
   </PropertyGroup>
   <!-- Compiled Source Files -->

diff --git a/src/libraries/System.Linq.Parallel/tests/Configurations.props b/src/libraries/System.Linq.Parallel/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Linq.Parallel/tests/Configurations.props
+++ b/src/libraries/System.Linq.Parallel/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj b/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj
index 66a9960..3164b73 100644 (file)
--- a/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj
+++ b/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">

diff --git a/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln b/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln
index e4854ff..653bc87 100644 (file)
--- a/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln
+++ b/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {7B88D79B-B799-4116-A7D0-AED572540CD4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7B88D79B-B799-4116-A7D0-AED572540CD4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7B88D79B-B799-4116-A7D0-AED572540CD4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7B88D79B-B799-4116-A7D0-AED572540CD4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {BE12B753-C130-4B68-86E3-877F1AEE52C0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {BE12B753-C130-4B68-86E3-877F1AEE52C0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {BE12B753-C130-4B68-86E3-877F1AEE52C0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {BE12B753-C130-4B68-86E3-877F1AEE52C0}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {7B88D79B-B799-4116-A7D0-AED572540CD4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7B88D79B-B799-4116-A7D0-AED572540CD4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7B88D79B-B799-4116-A7D0-AED572540CD4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7B88D79B-B799-4116-A7D0-AED572540CD4}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {BE12B753-C130-4B68-86E3-877F1AEE52C0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {BE12B753-C130-4B68-86E3-877F1AEE52C0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {BE12B753-C130-4B68-86E3-877F1AEE52C0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {BE12B753-C130-4B68-86E3-877F1AEE52C0}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Linq.Queryable/ref/Configurations.props b/src/libraries/System.Linq.Queryable/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Linq.Queryable/ref/Configurations.props
+++ b/src/libraries/System.Linq.Queryable/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Linq.Queryable/ref/System.Linq.Queryable.csproj b/src/libraries/System.Linq.Queryable/ref/System.Linq.Queryable.csproj
index 81ad250..f958c36 100644 (file)
--- a/src/libraries/System.Linq.Queryable/ref/System.Linq.Queryable.csproj
+++ b/src/libraries/System.Linq.Queryable/ref/System.Linq.Queryable.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Linq.Queryable.cs" />

diff --git a/src/libraries/System.Linq.Queryable/src/Configurations.props b/src/libraries/System.Linq.Queryable/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Linq.Queryable/src/Configurations.props
+++ b/src/libraries/System.Linq.Queryable/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj b/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj
index 56eb1da..c65d218 100644 (file)
--- a/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj
+++ b/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Linq.Queryable</AssemblyName>
     <RootNamespace>System.Linq.Queryable</RootNamespace>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Linq\CachedReflection.cs" />

diff --git a/src/libraries/System.Linq.Queryable/tests/Configurations.props b/src/libraries/System.Linq.Queryable/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Linq.Queryable/tests/Configurations.props
+++ b/src/libraries/System.Linq.Queryable/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj
index d918b37..1255ddb 100644 (file)
--- a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj
+++ b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AggregateTests.cs" />

diff --git a/src/libraries/System.Linq/System.Linq.sln b/src/libraries/System.Linq/System.Linq.sln
index fb87094..0d1bfe7 100644 (file)
--- a/src/libraries/System.Linq/System.Linq.sln
+++ b/src/libraries/System.Linq/System.Linq.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {7C70BB15-870B-4946-8098-625DACD645A6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7C70BB15-870B-4946-8098-625DACD645A6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7C70BB15-870B-4946-8098-625DACD645A6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7C70BB15-870B-4946-8098-625DACD645A6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {7C70BB15-870B-4946-8098-625DACD645A6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7C70BB15-870B-4946-8098-625DACD645A6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7C70BB15-870B-4946-8098-625DACD645A6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7C70BB15-870B-4946-8098-625DACD645A6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Linq/ref/Configurations.props b/src/libraries/System.Linq/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Linq/ref/Configurations.props
+++ b/src/libraries/System.Linq/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Linq/ref/System.Linq.csproj b/src/libraries/System.Linq/ref/System.Linq.csproj
index 1639c7c..7e076d8 100644 (file)
--- a/src/libraries/System.Linq/ref/System.Linq.csproj
+++ b/src/libraries/System.Linq/ref/System.Linq.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Linq/src/Configurations.props b/src/libraries/System.Linq/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Linq/src/Configurations.props
+++ b/src/libraries/System.Linq/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Linq/src/System.Linq.csproj b/src/libraries/System.Linq/src/System.Linq.csproj
index 1649b1c..0de1af0 100644 (file)
--- a/src/libraries/System.Linq/src/System.Linq.csproj
+++ b/src/libraries/System.Linq/src/System.Linq.csproj
@@ -2,12 +2,12 @@
   <PropertyGroup>
     <AssemblyName>System.Linq</AssemblyName>
     <RootNamespace>System.Linq</RootNamespace>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <ContractProject Include="..\ref\System.Linq.csproj">
-      <TargetGroup>netcoreapp</TargetGroup>
+      <TargetGroup>$(NetCoreAppCurrent)</TargetGroup>
     </ContractProject>
   </ItemGroup>
   <ItemGroup> <!-- Optimize for speed -->

diff --git a/src/libraries/System.Linq/tests/Configurations.props b/src/libraries/System.Linq/tests/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Linq/tests/Configurations.props
+++ b/src/libraries/System.Linq/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
index 5b3ab11..9950b1b 100644 (file)
--- a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
+++ b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AggregateTests.cs" />

diff --git a/src/libraries/System.Management/System.Management.sln b/src/libraries/System.Management/System.Management.sln
index 9627992..cc400b2 100644 (file)
--- a/src/libraries/System.Management/System.Management.sln
+++ b/src/libraries/System.Management/System.Management.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {5456707C-489E-4562-846E-B9598569F6BE}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {5456707C-489E-4562-846E-B9598569F6BE}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {5456707C-489E-4562-846E-B9598569F6BE}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {5456707C-489E-4562-846E-B9598569F6BE}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {950923D8-EC99-4F90-9BA6-8EB64582C555}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {950923D8-EC99-4F90-9BA6-8EB64582C555}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {950923D8-EC99-4F90-9BA6-8EB64582C555}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {950923D8-EC99-4F90-9BA6-8EB64582C555}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {5456707C-489E-4562-846E-B9598569F6BE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5456707C-489E-4562-846E-B9598569F6BE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5456707C-489E-4562-846E-B9598569F6BE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5456707C-489E-4562-846E-B9598569F6BE}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {950923D8-EC99-4F90-9BA6-8EB64582C555}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {950923D8-EC99-4F90-9BA6-8EB64582C555}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {950923D8-EC99-4F90-9BA6-8EB64582C555}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {950923D8-EC99-4F90-9BA6-8EB64582C555}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {CA17270B-079F-4D52-97E8-C0C2E8B9D7DB}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {CA17270B-079F-4D52-97E8-C0C2E8B9D7DB}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {CA17270B-079F-4D52-97E8-C0C2E8B9D7DB}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Management/src/Configurations.props b/src/libraries/System.Management/src/Configurations.props
index c4215ea..aefe09f 100644 (file)
--- a/src/libraries/System.Management/src/Configurations.props
+++ b/src/libraries/System.Management/src/Configurations.props
@@ -6,8 +6,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
-      _netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj
index efc1c0f..c08e8b8 100644 (file)
--- a/src/libraries/System.Management/src/System.Management.csproj
+++ b/src/libraries/System.Management/src/System.Management.csproj
@@ -4,7 +4,7 @@
     <NoWarn>$(NoWarn);0618</NoWarn>
     <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_SystemManagement</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' != 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">

diff --git a/src/libraries/System.Management/tests/Configurations.props b/src/libraries/System.Management/tests/Configurations.props
index c03a496..cc3d67b 100644 (file)
--- a/src/libraries/System.Management/tests/Configurations.props
+++ b/src/libraries/System.Management/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Management/tests/System.Management.Tests.csproj b/src/libraries/System.Management/tests/System.Management.Tests.csproj
index f9c78d2..5753e84 100644 (file)
--- a/src/libraries/System.Management/tests/System.Management.Tests.csproj
+++ b/src/libraries/System.Management/tests/System.Management.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="MofHelpers\MofCollection.cs" />

diff --git a/src/libraries/System.Memory/System.Memory.sln b/src/libraries/System.Memory/System.Memory.sln
index 786d0a3..8d6b1a5 100644 (file)
--- a/src/libraries/System.Memory/System.Memory.sln
+++ b/src/libraries/System.Memory/System.Memory.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {E883935B-D8FD-4FC9-A189-9D9E7F7EF550}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {E883935B-D8FD-4FC9-A189-9D9E7F7EF550}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {E883935B-D8FD-4FC9-A189-9D9E7F7EF550}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {E883935B-D8FD-4FC9-A189-9D9E7F7EF550}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {E883935B-D8FD-4FC9-A189-9D9E7F7EF550}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {E883935B-D8FD-4FC9-A189-9D9E7F7EF550}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {E883935B-D8FD-4FC9-A189-9D9E7F7EF550}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {E883935B-D8FD-4FC9-A189-9D9E7F7EF550}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Memory/ref/Configurations.props b/src/libraries/System.Memory/ref/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Memory/ref/Configurations.props
+++ b/src/libraries/System.Memory/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Memory/ref/System.Memory.csproj b/src/libraries/System.Memory/ref/System.Memory.csproj
index e7cd322..5f7d24c 100644 (file)
--- a/src/libraries/System.Memory/ref/System.Memory.csproj
+++ b/src/libraries/System.Memory/ref/System.Memory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Memory/src/Configurations.props b/src/libraries/System.Memory/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Memory/src/Configurations.props
+++ b/src/libraries/System.Memory/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Memory/src/System.Memory.csproj b/src/libraries/System.Memory/src/System.Memory.csproj
index efe4512..6e2285e 100644 (file)
--- a/src/libraries/System.Memory/src/System.Memory.csproj
+++ b/src/libraries/System.Memory/src/System.Memory.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <!-- ArrayBufferWriter is publicly exposed from the System.Memory ref and only it should define this constant as true.  -->
     <DefineConstants>$(DefineConstants);MAKE_ABW_PUBLIC</DefineConstants>
   </PropertyGroup>

diff --git a/src/libraries/System.Memory/tests/Configurations.props b/src/libraries/System.Memory/tests/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Memory/tests/Configurations.props
+++ b/src/libraries/System.Memory/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
index e0c7784..aebd4ba 100644 (file)
--- a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
+++ b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
@@ -4,7 +4,7 @@
     <IncludePartialFacadeTests>true</IncludePartialFacadeTests>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ArrayBufferWriter\ArrayBufferWriterTests.Byte.cs" />

diff --git a/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln b/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
index 3c40982..845e6ea 100644 (file)
--- a/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
+++ b/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
@@ -31,14 +31,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {A2ECDEDB-12B7-402C-9230-152B7601179F}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {A2ECDEDB-12B7-402C-9230-152B7601179F}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {A2ECDEDB-12B7-402C-9230-152B7601179F}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {A2ECDEDB-12B7-402C-9230-152B7601179F}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {A2ECDEDB-12B7-402C-9230-152B7601179F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A2ECDEDB-12B7-402C-9230-152B7601179F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A2ECDEDB-12B7-402C-9230-152B7601179F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {A2ECDEDB-12B7-402C-9230-152B7601179F}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {F75E3008-0562-42DF-BE72-C1384F12157E}.Debug|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Debug|Any CPU
                {F75E3008-0562-42DF-BE72-C1384F12157E}.Debug|Any CPU.Build.0 = netstandard2.0-Windows_NT-Debug|Any CPU
                {F75E3008-0562-42DF-BE72-C1384F12157E}.Release|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Release|Any CPU

diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/Configurations.props b/src/libraries/System.Net.Http.WinHttpHandler/src/Configurations.props
index cd4cc29..cd93747 100644 (file)
--- a/src/libraries/System.Net.Http.WinHttpHandler/src/Configurations.props
+++ b/src/libraries/System.Net.Http.WinHttpHandler/src/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netfx-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
index 1d630a9..3162793 100644 (file)
--- a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
@@ -3,7 +3,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true' and '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_WinHttpHandler</GeneratePlatformNotSupportedAssemblyMessage>
     <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'" >

diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props
index 8bfb431..96779f4 100644 (file)
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj
index 664167a..68941aa 100644 (file)
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true' ">
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">

diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props
index 0d96800..f687adb 100644 (file)
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
index b8bca5f..640d738 100644 (file)
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
@@ -3,7 +3,7 @@
     <NoWarn>$(NoWarn);0436</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <DefaultReferenceExclusions Include="System.Net.Http.WinHttpHandler" />

diff --git a/src/libraries/System.Net.Http/System.Net.Http.sln b/src/libraries/System.Net.Http/System.Net.Http.sln
index aca8883..c6b94d4 100644 (file)
--- a/src/libraries/System.Net.Http/System.Net.Http.sln
+++ b/src/libraries/System.Net.Http/System.Net.Http.sln
@@ -31,22 +31,22 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {C85CF035-7804-41FF-9557-48B7C948B58D}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {C85CF035-7804-41FF-9557-48B7C948B58D}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {C85CF035-7804-41FF-9557-48B7C948B58D}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {C85CF035-7804-41FF-9557-48B7C948B58D}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {C85CF035-7804-41FF-9557-48B7C948B58D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {C85CF035-7804-41FF-9557-48B7C948B58D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {C85CF035-7804-41FF-9557-48B7C948B58D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {C85CF035-7804-41FF-9557-48B7C948B58D}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.Http/ref/Configurations.props b/src/libraries/System.Net.Http/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.Http/ref/Configurations.props
+++ b/src/libraries/System.Net.Http/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Http/ref/System.Net.Http.csproj b/src/libraries/System.Net.Http/ref/System.Net.Http.csproj
index 622263d..f3e18d1 100644 (file)
--- a/src/libraries/System.Net.Http/ref/System.Net.Http.csproj
+++ b/src/libraries/System.Net.Http/ref/System.Net.Http.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Http.cs" />

diff --git a/src/libraries/System.Net.Http/src/Configurations.props b/src/libraries/System.Net.Http/src/Configurations.props
index 7778219..380403a 100644 (file)
--- a/src/libraries/System.Net.Http/src/Configurations.props
+++ b/src/libraries/System.Net.Http/src/Configurations.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-OSX;
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
index 72302df..8de5e94 100644 (file)
--- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj
+++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
@@ -7,7 +7,7 @@
     <NoWarn>$(NoWarn);0436;CS1573</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);HTTP_DLL</DefineConstants>
-    <Configurations>netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetsOSX)' == 'true' ">
     <DefineConstants>$(DefineConstants);SYSNETHTTP_NO_OPENSSL</DefineConstants>

diff --git a/src/libraries/System.Net.Http/tests/EnterpriseTests/Configurations.props b/src/libraries/System.Net.Http/tests/EnterpriseTests/Configurations.props
index 3ad47b8..9956ab2 100644 (file)
--- a/src/libraries/System.Net.Http/tests/EnterpriseTests/Configurations.props
+++ b/src/libraries/System.Net.Http/tests/EnterpriseTests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.Http/tests/EnterpriseTests/System.Net.Http.Enterprise.Tests.csproj b/src/libraries/System.Net.Http/tests/EnterpriseTests/System.Net.Http.Enterprise.Tests.csproj
index 5afe2ba..82f3806 100644 (file)
--- a/src/libraries/System.Net.Http/tests/EnterpriseTests/System.Net.Http.Enterprise.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/EnterpriseTests/System.Net.Http.Enterprise.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="HttpClientAuthenticationTest.cs" />

diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Http/tests/FunctionalTests/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
index 5c97da2..0b68363 100644 (file)
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
@@ -4,7 +4,7 @@
     <DefineConstants>$(DefineConstants);SYSNETHTTP_NO_OPENSSL</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs" Condition="'$(TargetsUnix)' == 'true'">

diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Configurations.props b/src/libraries/System.Net.Http/tests/UnitTests/Configurations.props
index 28007ae..01aaf3e 100644 (file)
--- a/src/libraries/System.Net.Http/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Net.Http/tests/UnitTests/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-OSX;
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
index 6aeebda..69c2dfc 100644 (file)
--- a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
@@ -3,7 +3,7 @@
     <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
   <ItemGroup>
@@ -311,22 +311,22 @@
     <Compile Include="..\..\src\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.cs">
       <Link>ProductionCode\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.Unix.cs" Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == 'netcoreapp'">
+    <Compile Include="..\..\src\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.Unix.cs" Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == '$(NetCoreAppCurrent)'">
       <Link>ProductionCode\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.Unix.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.Windows.cs" Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netcoreapp'">
+    <Compile Include="..\..\src\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.Windows.cs" Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == '$(NetCoreAppCurrent)'">
       <Link>ProductionCode\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.Windows.cs</Link>
     </Compile>
     <Compile Include="..\..\src\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.cs">
       <Link>ProductionCode\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.OSX.cs" Condition=" '$(TargetsOSX)' == 'true' And '$(TargetGroup)' == 'netcoreapp'">
+    <Compile Include="..\..\src\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.OSX.cs" Condition=" '$(TargetsOSX)' == 'true' And '$(TargetGroup)' == '$(NetCoreAppCurrent)'">
       <Link>ProductionCode\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.OSX.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Unix.cs" Condition=" '$(TargetsUnix)' == 'true' And '$(TargetsOSX)' != 'true' And '$(TargetGroup)' == 'netcoreapp'">
+    <Compile Include="..\..\src\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Unix.cs" Condition=" '$(TargetsUnix)' == 'true' And '$(TargetsOSX)' != 'true' And '$(TargetGroup)' == '$(NetCoreAppCurrent)'">
       <Link>ProductionCode\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Unix.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Windows.cs" Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netcoreapp'">
+    <Compile Include="..\..\src\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Windows.cs" Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == '$(NetCoreAppCurrent)'">
       <Link>ProductionCode\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Windows.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\HttpHandlerDefaults.cs">
@@ -334,7 +334,7 @@
     </Compile>
     <Compile Include="DigestAuthenticationTests.cs" />
     <Compile Include="Fakes\HttpClientHandler.cs" />
-    <Compile Include="Fakes\MacProxy.cs" Condition=" '$(TargetsOSX)' == 'true' And '$(TargetGroup)' == 'netcoreapp'" />
+    <Compile Include="Fakes\MacProxy.cs" Condition=" '$(TargetsOSX)' == 'true' And '$(TargetGroup)' == '$(NetCoreAppCurrent)'" />
     <Compile Include="Headers\AuthenticationHeaderValueTest.cs" />
     <Compile Include="Headers\ByteArrayHeaderParserTest.cs" />
     <Compile Include="Headers\CacheControlHeaderParserTest.cs" />

diff --git a/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln b/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln
index b090f02..534663c 100644 (file)
--- a/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln
+++ b/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {851A40FE-7F07-415D-8592-5FE2096E84D3}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {851A40FE-7F07-415D-8592-5FE2096E84D3}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {851A40FE-7F07-415D-8592-5FE2096E84D3}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {851A40FE-7F07-415D-8592-5FE2096E84D3}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {41899248-F846-4F88-91A1-01B037F93BF3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {41899248-F846-4F88-91A1-01B037F93BF3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {41899248-F846-4F88-91A1-01B037F93BF3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {41899248-F846-4F88-91A1-01B037F93BF3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {851A40FE-7F07-415D-8592-5FE2096E84D3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {851A40FE-7F07-415D-8592-5FE2096E84D3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {851A40FE-7F07-415D-8592-5FE2096E84D3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {851A40FE-7F07-415D-8592-5FE2096E84D3}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {41899248-F846-4F88-91A1-01B037F93BF3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {41899248-F846-4F88-91A1-01B037F93BF3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {41899248-F846-4F88-91A1-01B037F93BF3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {41899248-F846-4F88-91A1-01B037F93BF3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.HttpListener/ref/Configurations.props b/src/libraries/System.Net.HttpListener/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.HttpListener/ref/Configurations.props
+++ b/src/libraries/System.Net.HttpListener/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.csproj
index d89e840..54a28a5 100644 (file)
--- a/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.csproj
+++ b/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.HttpListener.cs" />

diff --git a/src/libraries/System.Net.HttpListener/src/Configurations.props b/src/libraries/System.Net.HttpListener/src/Configurations.props
index dd006cd..75eaac0 100644 (file)
--- a/src/libraries/System.Net.HttpListener/src/Configurations.props
+++ b/src/libraries/System.Net.HttpListener/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
index b45a263..7f56d35 100644 (file)
--- a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
+++ b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ForceManagedImplementation>false</ForceManagedImplementation>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Win32.Primitives" />

diff --git a/src/libraries/System.Net.HttpListener/tests/Configurations.props b/src/libraries/System.Net.HttpListener/tests/Configurations.props
index 7a72d5d..34685e8 100644 (file)
--- a/src/libraries/System.Net.HttpListener/tests/Configurations.props
+++ b/src/libraries/System.Net.HttpListener/tests/Configurations.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-OSX;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
index 7557fd6..f08d4cc 100644 (file)
--- a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
+++ b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <StringResourcesPath>../src/Resources/Strings.resx</StringResourcesPath>
-    <Configurations>netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="GetContextHelper.cs" />

diff --git a/src/libraries/System.Net.Mail/System.Net.Mail.sln b/src/libraries/System.Net.Mail/System.Net.Mail.sln
index 95c349a..c292693 100644 (file)
--- a/src/libraries/System.Net.Mail/System.Net.Mail.sln
+++ b/src/libraries/System.Net.Mail/System.Net.Mail.sln
@@ -31,22 +31,22 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {2525E37E-0EC1-4374-92FD-D2752BEED978}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2525E37E-0EC1-4374-92FD-D2752BEED978}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2525E37E-0EC1-4374-92FD-D2752BEED978}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2525E37E-0EC1-4374-92FD-D2752BEED978}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {301ABDC3-6604-477F-B7CB-1AAD6A8408CF}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {301ABDC3-6604-477F-B7CB-1AAD6A8408CF}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {301ABDC3-6604-477F-B7CB-1AAD6A8408CF}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {301ABDC3-6604-477F-B7CB-1AAD6A8408CF}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {2525E37E-0EC1-4374-92FD-D2752BEED978}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2525E37E-0EC1-4374-92FD-D2752BEED978}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2525E37E-0EC1-4374-92FD-D2752BEED978}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2525E37E-0EC1-4374-92FD-D2752BEED978}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {301ABDC3-6604-477F-B7CB-1AAD6A8408CF}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {301ABDC3-6604-477F-B7CB-1AAD6A8408CF}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {301ABDC3-6604-477F-B7CB-1AAD6A8408CF}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {301ABDC3-6604-477F-B7CB-1AAD6A8408CF}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.Mail/ref/Configurations.props b/src/libraries/System.Net.Mail/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.Mail/ref/Configurations.props
+++ b/src/libraries/System.Net.Mail/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Mail/ref/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/ref/System.Net.Mail.csproj
index fd42a2d..5f2089b 100644 (file)
--- a/src/libraries/System.Net.Mail/ref/System.Net.Mail.csproj
+++ b/src/libraries/System.Net.Mail/ref/System.Net.Mail.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Mail.cs" />

diff --git a/src/libraries/System.Net.Mail/src/Configurations.props b/src/libraries/System.Net.Mail/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.Net.Mail/src/Configurations.props
+++ b/src/libraries/System.Net.Mail/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
index d343c9e..c66cbad 100644 (file)
--- a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
+++ b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <ItemGroup>

diff --git a/src/libraries/System.Net.Mail/tests/Functional/Configurations.props b/src/libraries/System.Net.Mail/tests/Functional/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Net.Mail/tests/Functional/Configurations.props
+++ b/src/libraries/System.Net.Mail/tests/Functional/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
index f91fe3a..56329c4 100644 (file)
--- a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AlternateViewCollectionTest.cs" />

diff --git a/src/libraries/System.Net.Mail/tests/Unit/Configurations.props b/src/libraries/System.Net.Mail/tests/Unit/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Net.Mail/tests/Unit/Configurations.props
+++ b/src/libraries/System.Net.Mail/tests/Unit/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
index 926815f..0c5f722 100644 (file)
--- a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Base64EncodingTest.cs" />

diff --git a/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln b/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln
index feedd11..877fff9 100644 (file)
--- a/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln
+++ b/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln
@@ -36,26 +36,26 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {4FE5ECEE-ACC5-4558-A946-573426599B73}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {4FE5ECEE-ACC5-4558-A946-573426599B73}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {4FE5ECEE-ACC5-4558-A946-573426599B73}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {4FE5ECEE-ACC5-4558-A946-573426599B73}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F6D1C093-081D-46DE-B5A8-516533375FDD}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {F6D1C093-081D-46DE-B5A8-516533375FDD}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {F6D1C093-081D-46DE-B5A8-516533375FDD}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {F6D1C093-081D-46DE-B5A8-516533375FDD}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {239347DB-D566-48C9-9551-28AB3AD12EC3}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {239347DB-D566-48C9-9551-28AB3AD12EC3}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {239347DB-D566-48C9-9551-28AB3AD12EC3}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {239347DB-D566-48C9-9551-28AB3AD12EC3}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {1714448C-211E-48C1-8B7E-4EE667D336A1}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {1714448C-211E-48C1-8B7E-4EE667D336A1}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {1714448C-211E-48C1-8B7E-4EE667D336A1}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {1714448C-211E-48C1-8B7E-4EE667D336A1}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {324DF6B2-4234-47FF-A2C7-A739F19E8F17}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {324DF6B2-4234-47FF-A2C7-A739F19E8F17}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {324DF6B2-4234-47FF-A2C7-A739F19E8F17}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {324DF6B2-4234-47FF-A2C7-A739F19E8F17}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {4FE5ECEE-ACC5-4558-A946-573426599B73}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {4FE5ECEE-ACC5-4558-A946-573426599B73}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {4FE5ECEE-ACC5-4558-A946-573426599B73}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4FE5ECEE-ACC5-4558-A946-573426599B73}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F6D1C093-081D-46DE-B5A8-516533375FDD}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F6D1C093-081D-46DE-B5A8-516533375FDD}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F6D1C093-081D-46DE-B5A8-516533375FDD}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F6D1C093-081D-46DE-B5A8-516533375FDD}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {239347DB-D566-48C9-9551-28AB3AD12EC3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {239347DB-D566-48C9-9551-28AB3AD12EC3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {239347DB-D566-48C9-9551-28AB3AD12EC3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {239347DB-D566-48C9-9551-28AB3AD12EC3}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {1714448C-211E-48C1-8B7E-4EE667D336A1}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {1714448C-211E-48C1-8B7E-4EE667D336A1}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {1714448C-211E-48C1-8B7E-4EE667D336A1}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {1714448C-211E-48C1-8B7E-4EE667D336A1}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {324DF6B2-4234-47FF-A2C7-A739F19E8F17}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {324DF6B2-4234-47FF-A2C7-A739F19E8F17}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {324DF6B2-4234-47FF-A2C7-A739F19E8F17}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {324DF6B2-4234-47FF-A2C7-A739F19E8F17}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.NameResolution/ref/Configurations.props b/src/libraries/System.Net.NameResolution/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.NameResolution/ref/Configurations.props
+++ b/src/libraries/System.Net.NameResolution/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.NameResolution/ref/System.Net.NameResolution.csproj b/src/libraries/System.Net.NameResolution/ref/System.Net.NameResolution.csproj
index b3e76ad..18389f1 100644 (file)
--- a/src/libraries/System.Net.NameResolution/ref/System.Net.NameResolution.csproj
+++ b/src/libraries/System.Net.NameResolution/ref/System.Net.NameResolution.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.NameResolution.cs" />

diff --git a/src/libraries/System.Net.NameResolution/src/Configurations.props b/src/libraries/System.Net.NameResolution/src/Configurations.props
index dd006cd..75eaac0 100644 (file)
--- a/src/libraries/System.Net.NameResolution/src/Configurations.props
+++ b/src/libraries/System.Net.NameResolution/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
index f261d92..901370d 100644 (file)
--- a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
+++ b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Net.NameResolution</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Net\Dns.cs" />

diff --git a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
index 89d0f71..f92b32b 100644 (file)
--- a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
+++ b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="GetHostByAddressTest.cs" />

diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/Configurations.props b/src/libraries/System.Net.NameResolution/tests/PalTests/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Net.NameResolution/tests/PalTests/Configurations.props
+++ b/src/libraries/System.Net.NameResolution/tests/PalTests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
index f5bc1d1..167908b 100644 (file)
--- a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
+++ b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
@@ -2,13 +2,13 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
   <ItemGroup>
     <DefaultReferenceExclusions Include="System.Net.NameResolution" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <Compile Include="..\..\src\System\Net\IPHostEntry.cs">
       <Link>ProductionCode\System\Net\IPHostEntry.cs</Link>
     </Compile>

diff --git a/src/libraries/System.Net.NameResolution/tests/UnitTests/Configurations.props b/src/libraries/System.Net.NameResolution/tests/UnitTests/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Net.NameResolution/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Net.NameResolution/tests/UnitTests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj
index f94f132..2368b52 100644 (file)
--- a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj
+++ b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <!-- Avoid warnings about type conflicts for types we're building in -->
     <NoWarn>0436</NoWarn>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
   <ItemGroup>

diff --git a/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln b/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
index 38a8bd8..a5c706a 100644 (file)
--- a/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
+++ b/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {3CA89D6C-F8D1-4813-9775-F8D249686E31}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {3CA89D6C-F8D1-4813-9775-F8D249686E31}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {3CA89D6C-F8D1-4813-9775-F8D249686E31}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {3CA89D6C-F8D1-4813-9775-F8D249686E31}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {B897C3BE-7162-44BB-8B81-7A2464C082A7}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B897C3BE-7162-44BB-8B81-7A2464C082A7}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B897C3BE-7162-44BB-8B81-7A2464C082A7}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B897C3BE-7162-44BB-8B81-7A2464C082A7}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {3CA89D6C-F8D1-4813-9775-F8D249686E31}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {3CA89D6C-F8D1-4813-9775-F8D249686E31}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {3CA89D6C-F8D1-4813-9775-F8D249686E31}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {3CA89D6C-F8D1-4813-9775-F8D249686E31}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {B897C3BE-7162-44BB-8B81-7A2464C082A7}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B897C3BE-7162-44BB-8B81-7A2464C082A7}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B897C3BE-7162-44BB-8B81-7A2464C082A7}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B897C3BE-7162-44BB-8B81-7A2464C082A7}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.NetworkInformation/ref/Configurations.props b/src/libraries/System.Net.NetworkInformation/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.NetworkInformation/ref/Configurations.props
+++ b/src/libraries/System.Net.NetworkInformation/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj b/src/libraries/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj
index 60c6f52..e3c5453 100644 (file)
--- a/src/libraries/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj
+++ b/src/libraries/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.NetworkInformation.cs" />

diff --git a/src/libraries/System.Net.NetworkInformation/src/Configurations.props b/src/libraries/System.Net.NetworkInformation/src/Configurations.props
index d23e9c1..d785c0b 100644 (file)
--- a/src/libraries/System.Net.NetworkInformation/src/Configurations.props
+++ b/src/libraries/System.Net.NetworkInformation/src/Configurations.props
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Linux;
-      netcoreapp-OSX;
-      netcoreapp-FreeBSD;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Linux;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-FreeBSD;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
index 9c9664f..2035f79 100644 (file)
--- a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
+++ b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
@@ -4,7 +4,7 @@
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn Condition=" '$(TargetsFreeBSD)' == 'true'">$(NoWarn);CA1823</NoWarn>
-    <Configurations>netcoreapp-FreeBSD-Debug;netcoreapp-FreeBSD-Release;netcoreapp-Linux-Debug;netcoreapp-Linux-Release;netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-FreeBSD-Debug;$(NetCoreAppCurrent)-FreeBSD-Release;$(NetCoreAppCurrent)-Linux-Debug;$(NetCoreAppCurrent)-Linux-Release;$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Net\NetworkInformation\DuplicateAddressDetectionState.cs" />

diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
index 88d9188..cff5ff6 100644 (file)
--- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
+++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <!-- Shared code with src assembly -->

diff --git a/src/libraries/System.Net.Ping/System.Net.Ping.sln b/src/libraries/System.Net.Ping/System.Net.Ping.sln
index 6bab4e3..ba1af7a 100644 (file)
--- a/src/libraries/System.Net.Ping/System.Net.Ping.sln
+++ b/src/libraries/System.Net.Ping/System.Net.Ping.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {43CE20B7-389B-41BB-8390-447521DF3BD4}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {43CE20B7-389B-41BB-8390-447521DF3BD4}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {43CE20B7-389B-41BB-8390-447521DF3BD4}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {43CE20B7-389B-41BB-8390-447521DF3BD4}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {85FD05E8-A4B1-4B89-ABED-33AFD200CABD}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {85FD05E8-A4B1-4B89-ABED-33AFD200CABD}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {85FD05E8-A4B1-4B89-ABED-33AFD200CABD}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {85FD05E8-A4B1-4B89-ABED-33AFD200CABD}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {933C2AC2-1188-45D1-B0C1-08D6382DC0BE}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {933C2AC2-1188-45D1-B0C1-08D6382DC0BE}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {933C2AC2-1188-45D1-B0C1-08D6382DC0BE}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {933C2AC2-1188-45D1-B0C1-08D6382DC0BE}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {43CE20B7-389B-41BB-8390-447521DF3BD4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {43CE20B7-389B-41BB-8390-447521DF3BD4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {43CE20B7-389B-41BB-8390-447521DF3BD4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {43CE20B7-389B-41BB-8390-447521DF3BD4}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {85FD05E8-A4B1-4B89-ABED-33AFD200CABD}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {85FD05E8-A4B1-4B89-ABED-33AFD200CABD}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {85FD05E8-A4B1-4B89-ABED-33AFD200CABD}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {85FD05E8-A4B1-4B89-ABED-33AFD200CABD}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {933C2AC2-1188-45D1-B0C1-08D6382DC0BE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {933C2AC2-1188-45D1-B0C1-08D6382DC0BE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {933C2AC2-1188-45D1-B0C1-08D6382DC0BE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {933C2AC2-1188-45D1-B0C1-08D6382DC0BE}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.Ping/ref/Configurations.props b/src/libraries/System.Net.Ping/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.Ping/ref/Configurations.props
+++ b/src/libraries/System.Net.Ping/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Ping/ref/System.Net.Ping.csproj b/src/libraries/System.Net.Ping/ref/System.Net.Ping.csproj
index 5036866..8504e06 100644 (file)
--- a/src/libraries/System.Net.Ping/ref/System.Net.Ping.csproj
+++ b/src/libraries/System.Net.Ping/ref/System.Net.Ping.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Ping.cs" />

diff --git a/src/libraries/System.Net.Ping/src/Configurations.props b/src/libraries/System.Net.Ping/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.Net.Ping/src/Configurations.props
+++ b/src/libraries/System.Net.Ping/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
index 5cc3ced..91f6652 100644 (file)
--- a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
+++ b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Net.Ping</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573</NoWarn>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Net\NetworkInformation\IPStatus.cs" />

diff --git a/src/libraries/System.Net.Ping/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Ping/tests/FunctionalTests/Configurations.props
index 1e8dd5d..30c654b 100644 (file)
--- a/src/libraries/System.Net.Ping/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Ping/tests/FunctionalTests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
index 83edf55..ab07a0f 100644 (file)
--- a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Test APIs introduced after 1.0 -->

diff --git a/src/libraries/System.Net.Primitives/System.Net.Primitives.sln b/src/libraries/System.Net.Primitives/System.Net.Primitives.sln
index 9e8a4fe..771e1cc 100644 (file)
--- a/src/libraries/System.Net.Primitives/System.Net.Primitives.sln
+++ b/src/libraries/System.Net.Primitives/System.Net.Primitives.sln
@@ -36,26 +36,26 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.Primitives/ref/Configurations.props b/src/libraries/System.Net.Primitives/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.Primitives/ref/Configurations.props
+++ b/src/libraries/System.Net.Primitives/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.csproj
index 2932f48..2974804 100644 (file)
--- a/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.csproj
+++ b/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Primitives.cs" />

diff --git a/src/libraries/System.Net.Primitives/src/Configurations.props b/src/libraries/System.Net.Primitives/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.Net.Primitives/src/Configurations.props
+++ b/src/libraries/System.Net.Primitives/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Primitives/src/MatchingRefApiCompatBaseline.netcoreapp.txt b/src/libraries/System.Net.Primitives/src/MatchingRefApiCompatBaseline.netcoreapp5.0.txt
similarity index 100%
rename from src/libraries/System.Net.Primitives/src/MatchingRefApiCompatBaseline.netcoreapp.txt
rename to src/libraries/System.Net.Primitives/src/MatchingRefApiCompatBaseline.netcoreapp5.0.txt

diff --git a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
index af501a4..555d5d5 100644 (file)
--- a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
+++ b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
@@ -4,7 +4,7 @@
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ILLinkKeepDepAttributes>false</ILLinkKeepDepAttributes> <!-- See comments in Cookie.cs -->
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the

diff --git a/src/libraries/System.Net.Primitives/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Primitives/tests/FunctionalTests/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Net.Primitives/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Primitives/tests/FunctionalTests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj b/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj
index c9203bb..70d4c2e 100644 (file)
--- a/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CookieTest.cs" />

diff --git a/src/libraries/System.Net.Primitives/tests/PalTests/Configurations.props b/src/libraries/System.Net.Primitives/tests/PalTests/Configurations.props
index 1e8dd5d..30c654b 100644 (file)
--- a/src/libraries/System.Net.Primitives/tests/PalTests/Configurations.props
+++ b/src/libraries/System.Net.Primitives/tests/PalTests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
index 8de8ee2..b697606 100644 (file)
--- a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the 

diff --git a/src/libraries/System.Net.Primitives/tests/UnitTests/Configurations.props b/src/libraries/System.Net.Primitives/tests/UnitTests/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Net.Primitives/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Net.Primitives/tests/UnitTests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
index bcde0e7..9de772b 100644 (file)
--- a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>169,649</NoWarn>
     <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the 

diff --git a/src/libraries/System.Net.Quic/System.Net.Quic.sln b/src/libraries/System.Net.Quic/System.Net.Quic.sln
index 42dd1bd..356d2b1 100644 (file)
--- a/src/libraries/System.Net.Quic/System.Net.Quic.sln
+++ b/src/libraries/System.Net.Quic/System.Net.Quic.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.Quic/ref/Configurations.props b/src/libraries/System.Net.Quic/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.Quic/ref/Configurations.props
+++ b/src/libraries/System.Net.Quic/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Quic/ref/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/ref/System.Net.Quic.csproj
index 4bf7220..341e6a2 100644 (file)
--- a/src/libraries/System.Net.Quic/ref/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/ref/System.Net.Quic.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Quic.Temporary.cs" />

diff --git a/src/libraries/System.Net.Quic/src/Configurations.props b/src/libraries/System.Net.Quic/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.Net.Quic/src/Configurations.props
+++ b/src/libraries/System.Net.Quic/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
index f237416..939539f 100644 (file)
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Net.Quic</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <!-- All configurations -->

diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Quic/tests/FunctionalTests/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Net.Quic/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Tests.csproj b/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Tests.csproj
index 3e54cc9..dc6f0c7 100644 (file)
--- a/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Tests.csproj
+++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="QuicConnectionTests.cs" />

diff --git a/src/libraries/System.Net.Requests/System.Net.Requests.sln b/src/libraries/System.Net.Requests/System.Net.Requests.sln
index 1ace90a..042d257 100644 (file)
--- a/src/libraries/System.Net.Requests/System.Net.Requests.sln
+++ b/src/libraries/System.Net.Requests/System.Net.Requests.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {E520B5FD-C6FF-46CF-8079-6C8098013EA3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {E520B5FD-C6FF-46CF-8079-6C8098013EA3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {E520B5FD-C6FF-46CF-8079-6C8098013EA3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {E520B5FD-C6FF-46CF-8079-6C8098013EA3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F86C715C-E37B-4853-869E-D696AB3DB057}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F86C715C-E37B-4853-869E-D696AB3DB057}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F86C715C-E37B-4853-869E-D696AB3DB057}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F86C715C-E37B-4853-869E-D696AB3DB057}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {E520B5FD-C6FF-46CF-8079-6C8098013EA3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {E520B5FD-C6FF-46CF-8079-6C8098013EA3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {E520B5FD-C6FF-46CF-8079-6C8098013EA3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {E520B5FD-C6FF-46CF-8079-6C8098013EA3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F86C715C-E37B-4853-869E-D696AB3DB057}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F86C715C-E37B-4853-869E-D696AB3DB057}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F86C715C-E37B-4853-869E-D696AB3DB057}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F86C715C-E37B-4853-869E-D696AB3DB057}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.Requests/ref/Configurations.props b/src/libraries/System.Net.Requests/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.Requests/ref/Configurations.props
+++ b/src/libraries/System.Net.Requests/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Requests/ref/System.Net.Requests.csproj b/src/libraries/System.Net.Requests/ref/System.Net.Requests.csproj
index f36204c..7d51fe2 100644 (file)
--- a/src/libraries/System.Net.Requests/ref/System.Net.Requests.csproj
+++ b/src/libraries/System.Net.Requests/ref/System.Net.Requests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Requests.cs" />

diff --git a/src/libraries/System.Net.Requests/src/Configurations.props b/src/libraries/System.Net.Requests/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.Net.Requests/src/Configurations.props
+++ b/src/libraries/System.Net.Requests/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
index 11825f5..4e87c16 100644 (file)
--- a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
+++ b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
@@ -3,7 +3,7 @@
     <RootNamespace>System.Net.Requests</RootNamespace>
     <AssemblyName>System.Net.Requests</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FxCopBaseline.cs" />

diff --git a/src/libraries/System.Net.Requests/tests/Configurations.props b/src/libraries/System.Net.Requests/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.Requests/tests/Configurations.props
+++ b/src/libraries/System.Net.Requests/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
index aa4da6a..08009c9 100644 (file)
--- a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
+++ b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <StringResourcesPath>../src/Resources/Strings.resx</StringResourcesPath>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Net.Security/System.Net.Security.sln b/src/libraries/System.Net.Security/System.Net.Security.sln
index c332679..c9eae8c 100644 (file)
--- a/src/libraries/System.Net.Security/System.Net.Security.sln
+++ b/src/libraries/System.Net.Security/System.Net.Security.sln
@@ -31,22 +31,22 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {0D174EA9-9E61-4519-8D31-7BD2331A1982}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {0D174EA9-9E61-4519-8D31-7BD2331A1982}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {0D174EA9-9E61-4519-8D31-7BD2331A1982}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {0D174EA9-9E61-4519-8D31-7BD2331A1982}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {89F37791-6254-4D60-AB96-ACD3CCA0E771}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {89F37791-6254-4D60-AB96-ACD3CCA0E771}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {89F37791-6254-4D60-AB96-ACD3CCA0E771}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {89F37791-6254-4D60-AB96-ACD3CCA0E771}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {0D174EA9-9E61-4519-8D31-7BD2331A1982}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {0D174EA9-9E61-4519-8D31-7BD2331A1982}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {0D174EA9-9E61-4519-8D31-7BD2331A1982}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {0D174EA9-9E61-4519-8D31-7BD2331A1982}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {89F37791-6254-4D60-AB96-ACD3CCA0E771}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {89F37791-6254-4D60-AB96-ACD3CCA0E771}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {89F37791-6254-4D60-AB96-ACD3CCA0E771}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {89F37791-6254-4D60-AB96-ACD3CCA0E771}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.Security/ref/Configurations.props b/src/libraries/System.Net.Security/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.Security/ref/Configurations.props
+++ b/src/libraries/System.Net.Security/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Security/ref/System.Net.Security.csproj b/src/libraries/System.Net.Security/ref/System.Net.Security.csproj
index 6bcbc00..60ec143 100644 (file)
--- a/src/libraries/System.Net.Security/ref/System.Net.Security.csproj
+++ b/src/libraries/System.Net.Security/ref/System.Net.Security.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Security.cs" />

diff --git a/src/libraries/System.Net.Security/src/Configurations.props b/src/libraries/System.Net.Security/src/Configurations.props
index 7778219..380403a 100644 (file)
--- a/src/libraries/System.Net.Security/src/Configurations.props
+++ b/src/libraries/System.Net.Security/src/Configurations.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-OSX;
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/libraries/System.Net.Security/src/System.Net.Security.csproj
index f883a56..4b47e63 100644 (file)
--- a/src/libraries/System.Net.Security/src/System.Net.Security.csproj
+++ b/src/libraries/System.Net.Security/src/System.Net.Security.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Net.Security</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <!-- This is needed so that code for TlsCipherSuite will have no namespace (causes compile errors) when used within T4 template  -->
     <DefineConstants>$(DefineConstants);PRODUCT</DefineConstants>
   </PropertyGroup>

diff --git a/src/libraries/System.Net.Security/tests/EnterpriseTests/Configurations.props b/src/libraries/System.Net.Security/tests/EnterpriseTests/Configurations.props
index 3ad47b8..9956ab2 100644 (file)
--- a/src/libraries/System.Net.Security/tests/EnterpriseTests/Configurations.props
+++ b/src/libraries/System.Net.Security/tests/EnterpriseTests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.Security/tests/EnterpriseTests/System.Net.Security.Enterprise.Tests.csproj b/src/libraries/System.Net.Security/tests/EnterpriseTests/System.Net.Security.Enterprise.Tests.csproj
index 506734b..275b2d8 100644 (file)
--- a/src/libraries/System.Net.Security/tests/EnterpriseTests/System.Net.Security.Enterprise.Tests.csproj
+++ b/src/libraries/System.Net.Security/tests/EnterpriseTests/System.Net.Security.Enterprise.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <!-- NegotiateStream Tests -->

diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Security/tests/FunctionalTests/Configurations.props
index d2c7d64..c074f91 100644 (file)
--- a/src/libraries/System.Net.Security/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Security/tests/FunctionalTests/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
-      netcoreapp-OSX;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-OSX;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
index 5bb33e4..afddd56 100644 (file)
--- a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
+++ b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <AllowUnsafeBlocks Condition="'$(TargetsUnix)' == 'true'">true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <Choose>
     <!-- Disable the whole workitem on Windows arm64 until https://github.com/dotnet/core-eng/issues/5118 is fixed. -->

diff --git a/src/libraries/System.Net.Security/tests/UnitTests/Configurations.props b/src/libraries/System.Net.Security/tests/UnitTests/Configurations.props
index 704a0ae..55d3a5d 100644 (file)
--- a/src/libraries/System.Net.Security/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Net.Security/tests/UnitTests/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-OSX;
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
index c7bbd24..09d343b 100644 (file)
--- a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
@@ -10,7 +10,7 @@
     <NoWarn>436</NoWarn>
     <!-- Disable: CLSCompliant attribute is not needed -->
     <NoWarn>$(NoWarn);3021</NoWarn>
-    <Configurations>netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SslApplicationProtocolTests.cs" />

diff --git a/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln b/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln
index 06f2394..038cd43 100644 (file)
--- a/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln
+++ b/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {273A0AE8-6298-4382-9572-E39ACEB458A0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {273A0AE8-6298-4382-9572-E39ACEB458A0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {273A0AE8-6298-4382-9572-E39ACEB458A0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {273A0AE8-6298-4382-9572-E39ACEB458A0}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {273A0AE8-6298-4382-9572-E39ACEB458A0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {273A0AE8-6298-4382-9572-E39ACEB458A0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {273A0AE8-6298-4382-9572-E39ACEB458A0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {273A0AE8-6298-4382-9572-E39ACEB458A0}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.ServicePoint/ref/Configurations.props b/src/libraries/System.Net.ServicePoint/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.ServicePoint/ref/Configurations.props
+++ b/src/libraries/System.Net.ServicePoint/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj b/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj
index 3dc7b9c..a44ab05 100644 (file)
--- a/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj
+++ b/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.ServicePoint.cs" />

diff --git a/src/libraries/System.Net.ServicePoint/src/Configurations.props b/src/libraries/System.Net.ServicePoint/src/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Net.ServicePoint/src/Configurations.props
+++ b/src/libraries/System.Net.ServicePoint/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj b/src/libraries/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj
index d687995..73f53e6 100644 (file)
--- a/src/libraries/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj
+++ b/src/libraries/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CA5364</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">

diff --git a/src/libraries/System.Net.ServicePoint/tests/Configurations.props b/src/libraries/System.Net.ServicePoint/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.ServicePoint/tests/Configurations.props
+++ b/src/libraries/System.Net.ServicePoint/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj b/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj
index 1cf0152..08a39d5 100644 (file)
--- a/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj
+++ b/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ServicePointManagerTest.cs" />

diff --git a/src/libraries/System.Net.Sockets/System.Net.Sockets.sln b/src/libraries/System.Net.Sockets/System.Net.Sockets.sln
index c840bcb..24601b6 100644 (file)
--- a/src/libraries/System.Net.Sockets/System.Net.Sockets.sln
+++ b/src/libraries/System.Net.Sockets/System.Net.Sockets.sln
@@ -31,22 +31,22 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.Sockets/ref/Configurations.props b/src/libraries/System.Net.Sockets/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.Sockets/ref/Configurations.props
+++ b/src/libraries/System.Net.Sockets/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.csproj
index 3904382..4298e4f 100644 (file)
--- a/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.csproj
+++ b/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Sockets.cs" />

diff --git a/src/libraries/System.Net.Sockets/src/Configurations.props b/src/libraries/System.Net.Sockets/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.Net.Sockets/src/Configurations.props
+++ b/src/libraries/System.Net.Sockets/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
index 5c59d5c..f6383a1 100644 (file)
--- a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Net.Sockets</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <!-- SYSTEM_NET_SOCKETS_DLL is required to allow source-level code sharing for types defined within the

diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Sockets/tests/FunctionalTests/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
index 68f4a3c..43d26b8 100644 (file)
--- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
+++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Accept.cs" />

diff --git a/src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/Configurations.props b/src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/Configurations.props
+++ b/src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.Stress.Tests.csproj b/src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.Stress.Tests.csproj
index 69e343c..1153af6 100644 (file)
--- a/src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.Stress.Tests.csproj
+++ b/src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.Stress.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <!-- Manual test, don't run on CI -->
     <IgnoreForCI>true</IgnoreForCI>
   </PropertyGroup>

diff --git a/src/libraries/System.Net.WebClient/System.Net.WebClient.sln b/src/libraries/System.Net.WebClient/System.Net.WebClient.sln
index 8f8693c..1c19ff3 100644 (file)
--- a/src/libraries/System.Net.WebClient/System.Net.WebClient.sln
+++ b/src/libraries/System.Net.WebClient/System.Net.WebClient.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {D2348221-084D-4076-91BF-C24D28E7D386}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D2348221-084D-4076-91BF-C24D28E7D386}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D2348221-084D-4076-91BF-C24D28E7D386}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D2348221-084D-4076-91BF-C24D28E7D386}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {EA25218A-0470-44CC-BDF0-3E74D5848BD8}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {EA25218A-0470-44CC-BDF0-3E74D5848BD8}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {EA25218A-0470-44CC-BDF0-3E74D5848BD8}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {EA25218A-0470-44CC-BDF0-3E74D5848BD8}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {D2348221-084D-4076-91BF-C24D28E7D386}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D2348221-084D-4076-91BF-C24D28E7D386}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D2348221-084D-4076-91BF-C24D28E7D386}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D2348221-084D-4076-91BF-C24D28E7D386}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {EA25218A-0470-44CC-BDF0-3E74D5848BD8}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {EA25218A-0470-44CC-BDF0-3E74D5848BD8}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {EA25218A-0470-44CC-BDF0-3E74D5848BD8}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {EA25218A-0470-44CC-BDF0-3E74D5848BD8}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.WebClient/ref/Configurations.props b/src/libraries/System.Net.WebClient/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.WebClient/ref/Configurations.props
+++ b/src/libraries/System.Net.WebClient/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebClient/ref/System.Net.WebClient.csproj b/src/libraries/System.Net.WebClient/ref/System.Net.WebClient.csproj
index 992ca86..9f62cec 100644 (file)
--- a/src/libraries/System.Net.WebClient/ref/System.Net.WebClient.csproj
+++ b/src/libraries/System.Net.WebClient/ref/System.Net.WebClient.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.WebClient.cs" />

diff --git a/src/libraries/System.Net.WebClient/src/Configurations.props b/src/libraries/System.Net.WebClient/src/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Net.WebClient/src/Configurations.props
+++ b/src/libraries/System.Net.WebClient/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj b/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj
index 03f2490..020d3ec 100644 (file)
--- a/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj
+++ b/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <ItemGroup>

diff --git a/src/libraries/System.Net.WebClient/tests/Configurations.props b/src/libraries/System.Net.WebClient/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.WebClient/tests/Configurations.props
+++ b/src/libraries/System.Net.WebClient/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj b/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj
index 00bbdf1..f92b0de 100644 (file)
--- a/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj
+++ b/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln b/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
index 124ae6d..803a1d6 100644 (file)
--- a/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
+++ b/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.WebHeaderCollection/ref/Configurations.props b/src/libraries/System.Net.WebHeaderCollection/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.WebHeaderCollection/ref/Configurations.props
+++ b/src/libraries/System.Net.WebHeaderCollection/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj b/src/libraries/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj
index ab6c09a..e67e205 100644 (file)
--- a/src/libraries/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj
+++ b/src/libraries/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
     <!-- Disable 8610 (Nullability of reference type doesn't match overridden member) warning so it doesn't turn into an error -->
     <NoWarn>$(NoWarn);8610</NoWarn>

diff --git a/src/libraries/System.Net.WebHeaderCollection/src/Configurations.props b/src/libraries/System.Net.WebHeaderCollection/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.WebHeaderCollection/src/Configurations.props
+++ b/src/libraries/System.Net.WebHeaderCollection/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj b/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj
index b4afb74..dbec9c6 100644 (file)
--- a/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj
+++ b/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Net.WebHeaderCollection</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Net.WebHeaderCollection/tests/Configurations.props b/src/libraries/System.Net.WebHeaderCollection/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.WebHeaderCollection/tests/Configurations.props
+++ b/src/libraries/System.Net.WebHeaderCollection/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj b/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj
index 835f9d8..85c3751 100644 (file)
--- a/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj
+++ b/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="WebHeaderCollectionTest.cs" />

diff --git a/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln b/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln
index b2116f9..ed1048d 100644 (file)
--- a/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln
+++ b/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {6C18AD20-E20F-4652-83E3-D24E4670530D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6C18AD20-E20F-4652-83E3-D24E4670530D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6C18AD20-E20F-4652-83E3-D24E4670530D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6C18AD20-E20F-4652-83E3-D24E4670530D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {B7B008FB-2C9F-4111-887C-E3FEC284FE3C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B7B008FB-2C9F-4111-887C-E3FEC284FE3C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B7B008FB-2C9F-4111-887C-E3FEC284FE3C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B7B008FB-2C9F-4111-887C-E3FEC284FE3C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {6C18AD20-E20F-4652-83E3-D24E4670530D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6C18AD20-E20F-4652-83E3-D24E4670530D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6C18AD20-E20F-4652-83E3-D24E4670530D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6C18AD20-E20F-4652-83E3-D24E4670530D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {B7B008FB-2C9F-4111-887C-E3FEC284FE3C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B7B008FB-2C9F-4111-887C-E3FEC284FE3C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B7B008FB-2C9F-4111-887C-E3FEC284FE3C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B7B008FB-2C9F-4111-887C-E3FEC284FE3C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.WebProxy/ref/Configurations.props b/src/libraries/System.Net.WebProxy/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.WebProxy/ref/Configurations.props
+++ b/src/libraries/System.Net.WebProxy/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebProxy/ref/System.Net.WebProxy.csproj b/src/libraries/System.Net.WebProxy/ref/System.Net.WebProxy.csproj
index 01a6a23..b6b7ea4 100644 (file)
--- a/src/libraries/System.Net.WebProxy/ref/System.Net.WebProxy.csproj
+++ b/src/libraries/System.Net.WebProxy/ref/System.Net.WebProxy.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.WebProxy.cs" />

diff --git a/src/libraries/System.Net.WebProxy/src/Configurations.props b/src/libraries/System.Net.WebProxy/src/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Net.WebProxy/src/Configurations.props
+++ b/src/libraries/System.Net.WebProxy/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Net.WebProxy/src/System.Net.WebProxy.csproj b/src/libraries/System.Net.WebProxy/src/System.Net.WebProxy.csproj
index ee84582..936dfb4 100644 (file)
--- a/src/libraries/System.Net.WebProxy/src/System.Net.WebProxy.csproj
+++ b/src/libraries/System.Net.WebProxy/src/System.Net.WebProxy.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <ItemGroup>

diff --git a/src/libraries/System.Net.WebProxy/tests/Configurations.props b/src/libraries/System.Net.WebProxy/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.WebProxy/tests/Configurations.props
+++ b/src/libraries/System.Net.WebProxy/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.csproj b/src/libraries/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.csproj
index d2f8aa4..1b7f188 100644 (file)
--- a/src/libraries/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.csproj
+++ b/src/libraries/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="WebProxyTest.cs" />

diff --git a/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln b/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
index da7ffdf..8a603ec 100644 (file)
--- a/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
+++ b/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {7C395A91-D955-444C-98BF-D3F809A56CE1}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {7C395A91-D955-444C-98BF-D3F809A56CE1}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {7C395A91-D955-444C-98BF-D3F809A56CE1}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {7C395A91-D955-444C-98BF-D3F809A56CE1}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F282B57E-2E1E-422B-8AC2-88145E37B809}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F282B57E-2E1E-422B-8AC2-88145E37B809}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F282B57E-2E1E-422B-8AC2-88145E37B809}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F282B57E-2E1E-422B-8AC2-88145E37B809}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {7C395A91-D955-444C-98BF-D3F809A56CE1}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7C395A91-D955-444C-98BF-D3F809A56CE1}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {7C395A91-D955-444C-98BF-D3F809A56CE1}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {7C395A91-D955-444C-98BF-D3F809A56CE1}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F282B57E-2E1E-422B-8AC2-88145E37B809}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F282B57E-2E1E-422B-8AC2-88145E37B809}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F282B57E-2E1E-422B-8AC2-88145E37B809}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F282B57E-2E1E-422B-8AC2-88145E37B809}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.WebSockets.Client/ref/Configurations.props b/src/libraries/System.Net.WebSockets.Client/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.WebSockets.Client/ref/Configurations.props
+++ b/src/libraries/System.Net.WebSockets.Client/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj b/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj
index fa82c41..f1a7d20 100644 (file)
--- a/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj
+++ b/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.WebSockets.Client.cs" />

diff --git a/src/libraries/System.Net.WebSockets.Client/src/Configurations.props b/src/libraries/System.Net.WebSockets.Client/src/Configurations.props
index 1c0ceb0..f8d083e 100644 (file)
--- a/src/libraries/System.Net.WebSockets.Client/src/Configurations.props
+++ b/src/libraries/System.Net.WebSockets.Client/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj b/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
index 6d5f85f..7a9e293 100644 (file)
--- a/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
+++ b/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573</NoWarn>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Net\WebSockets\ClientWebSocket.cs" />

diff --git a/src/libraries/System.Net.WebSockets.Client/tests/Configurations.props b/src/libraries/System.Net.WebSockets.Client/tests/Configurations.props
index dd006cd..75eaac0 100644 (file)
--- a/src/libraries/System.Net.WebSockets.Client/tests/Configurations.props
+++ b/src/libraries/System.Net.WebSockets.Client/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
index d32a462..078dbc1 100644 (file)
--- a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
+++ b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <StringResourcesPath>../src/Resources/Strings.resx</StringResourcesPath>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
   </PropertyGroup>
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->

diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/System.Net.WebSockets.WebSocketProtocol.sln b/src/libraries/System.Net.WebSockets.WebSocketProtocol/System.Net.WebSockets.WebSocketProtocol.sln
index 3aac1b1..ff36adb 100644 (file)
--- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/System.Net.WebSockets.WebSocketProtocol.sln
+++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/System.Net.WebSockets.WebSocketProtocol.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {747BE014-7C1D-4460-95AF-B41C35717165}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {747BE014-7C1D-4460-95AF-B41C35717165}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {747BE014-7C1D-4460-95AF-B41C35717165}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {747BE014-7C1D-4460-95AF-B41C35717165}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {747BE014-7C1D-4460-95AF-B41C35717165}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {747BE014-7C1D-4460-95AF-B41C35717165}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {747BE014-7C1D-4460-95AF-B41C35717165}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {747BE014-7C1D-4460-95AF-B41C35717165}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {203345A4-0E3B-43C1-ADEB-FF493E578063}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {203345A4-0E3B-43C1-ADEB-FF493E578063}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {203345A4-0E3B-43C1-ADEB-FF493E578063}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/Configurations.props b/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/Configurations.props
index 49a9f1f..dbfbb7d 100644 (file)
--- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/Configurations.props
+++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj
index 0c26f89..7d4e9ab 100644 (file)
--- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj
+++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Net.WebSockets.WebSocketProtocol</AssemblyName>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Net\WebSockets\ManagedWebSocket.cs">
@@ -16,7 +16,7 @@
     <Compile Include="System\Net\WebSockets\ManagedWebSocketExtensions.cs" />
     <Compile Include="System\Net\WebSockets\WebSocketProtocol.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)'!='netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)'!='$(NetCoreAppCurrent)'">
     <Compile Include="System\Numerics\BitOperations.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' == 'true'">

diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/Configurations.props b/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/Configurations.props
+++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj
index 7376287..1352ebf 100644 (file)
--- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj
+++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Net\WebSockets\WebSocketCreateTest.cs">

diff --git a/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln b/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln
index b7cd4bd..87ffb3b 100644 (file)
--- a/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln
+++ b/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {A2F08695-A550-4AA2-806D-E5E7D86D8F25}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A2F08695-A550-4AA2-806D-E5E7D86D8F25}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A2F08695-A550-4AA2-806D-E5E7D86D8F25}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A2F08695-A550-4AA2-806D-E5E7D86D8F25}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {A2F08695-A550-4AA2-806D-E5E7D86D8F25}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A2F08695-A550-4AA2-806D-E5E7D86D8F25}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A2F08695-A550-4AA2-806D-E5E7D86D8F25}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A2F08695-A550-4AA2-806D-E5E7D86D8F25}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Net.WebSockets/ref/Configurations.props b/src/libraries/System.Net.WebSockets/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.WebSockets/ref/Configurations.props
+++ b/src/libraries/System.Net.WebSockets/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebSockets/ref/System.Net.WebSockets.csproj b/src/libraries/System.Net.WebSockets/ref/System.Net.WebSockets.csproj
index 209bb96..b611277 100644 (file)
--- a/src/libraries/System.Net.WebSockets/ref/System.Net.WebSockets.csproj
+++ b/src/libraries/System.Net.WebSockets/ref/System.Net.WebSockets.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.WebSockets.cs" />

diff --git a/src/libraries/System.Net.WebSockets/src/Configurations.props b/src/libraries/System.Net.WebSockets/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.WebSockets/src/Configurations.props
+++ b/src/libraries/System.Net.WebSockets/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj b/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj
index 70629c2..1b52202 100644 (file)
--- a/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj
+++ b/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Net.WebSockets</AssemblyName>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Net\WebSockets\ManagedWebSocket.netcoreapp.cs" />

diff --git a/src/libraries/System.Net.WebSockets/tests/Configurations.props b/src/libraries/System.Net.WebSockets/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Net.WebSockets/tests/Configurations.props
+++ b/src/libraries/System.Net.WebSockets/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj
index 0ca4881..9c8d2b5 100644 (file)
--- a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj
+++ b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="WebSocketTests.cs" />

diff --git a/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln b/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln
index 2ae0d01..1c6e3ab 100644 (file)
--- a/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln
+++ b/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {D4718CD3-8492-4734-94B7-E31A39AA6275}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D4718CD3-8492-4734-94B7-E31A39AA6275}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D4718CD3-8492-4734-94B7-E31A39AA6275}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D4718CD3-8492-4734-94B7-E31A39AA6275}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {D4718CD3-8492-4734-94B7-E31A39AA6275}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D4718CD3-8492-4734-94B7-E31A39AA6275}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D4718CD3-8492-4734-94B7-E31A39AA6275}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D4718CD3-8492-4734-94B7-E31A39AA6275}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {BE0F13BE-9140-49A8-9FDD-994D0D8A3805}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {BE0F13BE-9140-49A8-9FDD-994D0D8A3805}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {BE0F13BE-9140-49A8-9FDD-994D0D8A3805}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Numerics.Tensors/tests/Configurations.props b/src/libraries/System.Numerics.Tensors/tests/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Numerics.Tensors/tests/Configurations.props
+++ b/src/libraries/System.Numerics.Tensors/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj b/src/libraries/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj
index a8a89be..48f953d 100644 (file)
--- a/src/libraries/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj
+++ b/src/libraries/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
   </PropertyGroup>

diff --git a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln
index 364023c..a419eb9 100644 (file)
--- a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln
+++ b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {650277B5-9423-4ACE-BB54-2659995B21C7}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {650277B5-9423-4ACE-BB54-2659995B21C7}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {650277B5-9423-4ACE-BB54-2659995B21C7}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {650277B5-9423-4ACE-BB54-2659995B21C7}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {650277B5-9423-4ACE-BB54-2659995B21C7}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {650277B5-9423-4ACE-BB54-2659995B21C7}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {650277B5-9423-4ACE-BB54-2659995B21C7}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {650277B5-9423-4ACE-BB54-2659995B21C7}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Numerics.Vectors/ref/Configurations.props b/src/libraries/System.Numerics.Vectors/ref/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Numerics.Vectors/ref/Configurations.props
+++ b/src/libraries/System.Numerics.Vectors/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj b/src/libraries/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj
index ee125f4..6b717a3 100644 (file)
--- a/src/libraries/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj
+++ b/src/libraries/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Numerics.Vectors/src/Configurations.props b/src/libraries/System.Numerics.Vectors/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Numerics.Vectors/src/Configurations.props
+++ b/src/libraries/System.Numerics.Vectors/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
index 799f70e..c9c65cd 100644 (file)
--- a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
+++ b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Numerics.Vectors/tests/Configurations.props b/src/libraries/System.Numerics.Vectors/tests/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Numerics.Vectors/tests/Configurations.props
+++ b/src/libraries/System.Numerics.Vectors/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj b/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj
index 8ec2ddc..e7433e8 100644 (file)
--- a/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj
+++ b/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.ObjectModel/System.ObjectModel.sln b/src/libraries/System.ObjectModel/System.ObjectModel.sln
index e1b14ad..4e1fffe 100644 (file)
--- a/src/libraries/System.ObjectModel/System.ObjectModel.sln
+++ b/src/libraries/System.ObjectModel/System.ObjectModel.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {43841228-2A2B-4215-B97F-33006995E486}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {43841228-2A2B-4215-B97F-33006995E486}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {43841228-2A2B-4215-B97F-33006995E486}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {43841228-2A2B-4215-B97F-33006995E486}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {F24D3391-2928-4E83-AADE-A4461E5CAE50}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F24D3391-2928-4E83-AADE-A4461E5CAE50}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F24D3391-2928-4E83-AADE-A4461E5CAE50}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F24D3391-2928-4E83-AADE-A4461E5CAE50}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {72CD7613-337A-41C1-BE90-391973C25201}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {72CD7613-337A-41C1-BE90-391973C25201}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {72CD7613-337A-41C1-BE90-391973C25201}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {72CD7613-337A-41C1-BE90-391973C25201}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {43841228-2A2B-4215-B97F-33006995E486}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {43841228-2A2B-4215-B97F-33006995E486}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {43841228-2A2B-4215-B97F-33006995E486}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {43841228-2A2B-4215-B97F-33006995E486}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {F24D3391-2928-4E83-AADE-A4461E5CAE50}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F24D3391-2928-4E83-AADE-A4461E5CAE50}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F24D3391-2928-4E83-AADE-A4461E5CAE50}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F24D3391-2928-4E83-AADE-A4461E5CAE50}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {72CD7613-337A-41C1-BE90-391973C25201}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {72CD7613-337A-41C1-BE90-391973C25201}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {72CD7613-337A-41C1-BE90-391973C25201}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {72CD7613-337A-41C1-BE90-391973C25201}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.ObjectModel/ref/Configurations.props b/src/libraries/System.ObjectModel/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ObjectModel/ref/Configurations.props
+++ b/src/libraries/System.ObjectModel/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ObjectModel/ref/System.ObjectModel.csproj b/src/libraries/System.ObjectModel/ref/System.ObjectModel.csproj
index bafa956..ce6d7a4 100644 (file)
--- a/src/libraries/System.ObjectModel/ref/System.ObjectModel.csproj
+++ b/src/libraries/System.ObjectModel/ref/System.ObjectModel.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.ObjectModel/src/Configurations.props b/src/libraries/System.ObjectModel/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ObjectModel/src/Configurations.props
+++ b/src/libraries/System.ObjectModel/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj b/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj
index d04f9eb..0eb6d91 100644 (file)
--- a/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj
+++ b/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.ObjectModel</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.ObjectModel/tests/Configurations.props b/src/libraries/System.ObjectModel/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.ObjectModel/tests/Configurations.props
+++ b/src/libraries/System.ObjectModel/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
index e11d165..5935960 100644 (file)
--- a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
+++ b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerableTest.cs">

diff --git a/src/libraries/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln b/src/libraries/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln
index 824729c..d62e824 100644 (file)
--- a/src/libraries/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln
+++ b/src/libraries/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln
@@ -12,10 +12,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Private.DataContractSerialization/src/Configurations.props b/src/libraries/System.Private.DataContractSerialization/src/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Private.DataContractSerialization/src/Configurations.props
+++ b/src/libraries/System.Private.DataContractSerialization/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
index 3185cc0..d4c921c 100644 (file)
--- a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
+++ b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
@@ -8,7 +8,7 @@
     <DebugSymbols>true</DebugSymbols>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DefineConstants>$(DefineConstants);FEATURE_SERIALIZATION</DefineConstants>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <!-- Too much private reflection. Do not bother with trimming -->
     <ILLinkTrimAssembly>false</ILLinkTrimAssembly>
   </PropertyGroup>

diff --git a/src/libraries/System.Private.Uri/System.Private.Uri.sln b/src/libraries/System.Private.Uri/System.Private.Uri.sln
index ed55d32..390be11 100644 (file)
--- a/src/libraries/System.Private.Uri/System.Private.Uri.sln
+++ b/src/libraries/System.Private.Uri/System.Private.Uri.sln
@@ -29,22 +29,22 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {0febe054-68ac-446f-b999-9068736d3cec}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {0febe054-68ac-446f-b999-9068736d3cec}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {0febe054-68ac-446f-b999-9068736d3cec}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {0febe054-68ac-446f-b999-9068736d3cec}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {96AF3242-A368-4F13-B006-A722CC3B8517}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {96AF3242-A368-4F13-B006-A722CC3B8517}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {96AF3242-A368-4F13-B006-A722CC3B8517}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {96AF3242-A368-4F13-B006-A722CC3B8517}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {0febe054-68ac-446f-b999-9068736d3cec}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {0febe054-68ac-446f-b999-9068736d3cec}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {0febe054-68ac-446f-b999-9068736d3cec}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {0febe054-68ac-446f-b999-9068736d3cec}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {96AF3242-A368-4F13-B006-A722CC3B8517}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {96AF3242-A368-4F13-B006-A722CC3B8517}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {96AF3242-A368-4F13-B006-A722CC3B8517}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {96AF3242-A368-4F13-B006-A722CC3B8517}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Private.Uri/src/Configurations.props b/src/libraries/System.Private.Uri/src/Configurations.props
index 7e12b46..c31cf2a 100644 (file)
--- a/src/libraries/System.Private.Uri/src/Configurations.props
+++ b/src/libraries/System.Private.Uri/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj
index 43f9892..a7e3afb 100644 (file)
--- a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj
+++ b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Private.Uri</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Collections\Generic\ArrayBuilder.cs">

diff --git a/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/Configurations.props b/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/Configurations.props
+++ b/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj b/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj
index 5d3ab19..cc2a701 100644 (file)
--- a/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj
+++ b/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="UriRelativeResolutionTest.cs" />

diff --git a/src/libraries/System.Private.Uri/tests/FunctionalTests/Configurations.props b/src/libraries/System.Private.Uri/tests/FunctionalTests/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Private.Uri/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Private.Uri/tests/FunctionalTests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj b/src/libraries/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj
index 0a0d0b1..d445962 100644 (file)
--- a/src/libraries/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj
+++ b/src/libraries/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AppxUriValue.cs" />

diff --git a/src/libraries/System.Private.Uri/tests/UnitTests/Configurations.props b/src/libraries/System.Private.Uri/tests/UnitTests/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Private.Uri/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Private.Uri/tests/UnitTests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj b/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj
index 82fb2fe..d00150a 100644 (file)
--- a/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj
+++ b/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>436</NoWarn>
     <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln b/src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln
index 4bc27e7..b9cf872 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln
+++ b/src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln
@@ -83,58 +83,58 @@ Global
                {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Release|Any CPU.Build.0 = Release|Any CPU
-               {C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Release|Any CPU.Build.0 = Release|Any CPU
-               {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {CB11B315-2567-4574-977D-89E3135243C4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {CB11B315-2567-4574-977D-89E3135243C4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {CB11B315-2567-4574-977D-89E3135243C4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {CB11B315-2567-4574-977D-89E3135243C4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {CB11B315-2567-4574-977D-89E3135243C4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {CB11B315-2567-4574-977D-89E3135243C4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {CB11B315-2567-4574-977D-89E3135243C4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {CB11B315-2567-4574-977D-89E3135243C4}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {979510CE-9042-4F8D-9C74-EE03B89194CC}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {979510CE-9042-4F8D-9C74-EE03B89194CC}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {979510CE-9042-4F8D-9C74-EE03B89194CC}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
                {979510CE-9042-4F8D-9C74-EE03B89194CC}.Release|Any CPU.Build.0 = netstandard2.0-Release|Any CPU
-               {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {10D52320-17B7-476E-BBD2-A1064DD38CBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {10D52320-17B7-476E-BBD2-A1064DD38CBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {10D52320-17B7-476E-BBD2-A1064DD38CBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {10D52320-17B7-476E-BBD2-A1064DD38CBF}.Release|Any CPU.Build.0 = Release|Any CPU
-               {BAC347A3-9841-44FC-B1E3-2344D1152C23}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {BAC347A3-9841-44FC-B1E3-2344D1152C23}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {BAC347A3-9841-44FC-B1E3-2344D1152C23}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {BAC347A3-9841-44FC-B1E3-2344D1152C23}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {BAC347A3-9841-44FC-B1E3-2344D1152C23}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {BAC347A3-9841-44FC-B1E3-2344D1152C23}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {BAC347A3-9841-44FC-B1E3-2344D1152C23}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {BAC347A3-9841-44FC-B1E3-2344D1152C23}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Private.Xml.Linq/src/Configurations.props b/src/libraries/System.Private.Xml.Linq/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/src/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj b/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj
index dfb8760..296f1a3 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj
+++ b/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Private.Xml.Linq</AssemblyName>
     <RootNamespace>System.Xml</RootNamespace>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" />

diff --git a/src/libraries/System.Private.Xml.Linq/tests/Properties/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/Properties/Configurations.props
index 7eb0e11..947de17 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/Properties/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/tests/Properties/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj
index 1e35c62..1b18013 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DeepEquals.cs" />

diff --git a/src/libraries/System.Private.Xml.Linq/tests/SDMSample/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/SDMSample/Configurations.props
index beb53a9..c50114d 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/SDMSample/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/tests/SDMSample/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj
index 0a71ab2..e9a725f 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SDMAttribute.cs" />

diff --git a/src/libraries/System.Private.Xml.Linq/tests/Streaming/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/Streaming/Configurations.props
index 7eb0e11..947de17 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/Streaming/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/tests/Streaming/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj
index ec53435..1ebe87a 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="StreamExtensions.cs" />

diff --git a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/Configurations.props
index 7eb0e11..947de17 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
index 1acadbb..1dc1974 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs">

diff --git a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj
index 16f6b5f..bb7f3a8 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>XDocument.Common</AssemblyName>
     <RootNamespace>CoreXml.Test.XLinq</RootNamespace>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BridgeHelpers.cs" />

diff --git a/src/libraries/System.Private.Xml.Linq/tests/events/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/events/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/events/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/tests/events/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj
index a2fa00c..d750900 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="EventsAdd.cs" />

diff --git a/src/libraries/System.Private.Xml.Linq/tests/misc/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/misc/Configurations.props
index 7eb0e11..947de17 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/misc/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/tests/misc/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj
index 15577df..289be82 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Annotation.cs" />

diff --git a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/Configurations.props
index 7eb0e11..947de17 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj
index 02aa3cf..4043878 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NoWarn>$(NoWarn);xUnit1013</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs">

diff --git a/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/Configurations.props
index 7eb0e11..947de17 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj
index d210772..f0af3fb 100644 (file)
--- a/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NoWarn>$(NoWarn);xUnit1013</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ClassStamp.cs" />

diff --git a/src/libraries/System.Private.Xml/System.Private.Xml.sln b/src/libraries/System.Private.Xml/System.Private.Xml.sln
index 4c2f395..cdfd60e 100644 (file)
--- a/src/libraries/System.Private.Xml/System.Private.Xml.sln
+++ b/src/libraries/System.Private.Xml/System.Private.Xml.sln
@@ -154,122 +154,122 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {B51913C2-478E-46AA-A523-521BD4593651}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B51913C2-478E-46AA-A523-521BD4593651}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B51913C2-478E-46AA-A523-521BD4593651}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B51913C2-478E-46AA-A523-521BD4593651}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {1C8F67D6-1953-49D3-B716-F298883A79C6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {1C8F67D6-1953-49D3-B716-F298883A79C6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {1C8F67D6-1953-49D3-B716-F298883A79C6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {1C8F67D6-1953-49D3-B716-F298883A79C6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {6C6F323D-054E-4723-9DEA-1C5E1E45DF88}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6C6F323D-054E-4723-9DEA-1C5E1E45DF88}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6C6F323D-054E-4723-9DEA-1C5E1E45DF88}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6C6F323D-054E-4723-9DEA-1C5E1E45DF88}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {9EDAADA8-B658-430F-97EE-CCA494883D86}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {9EDAADA8-B658-430F-97EE-CCA494883D86}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {9EDAADA8-B658-430F-97EE-CCA494883D86}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {9EDAADA8-B658-430F-97EE-CCA494883D86}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {B01E2AE1-1B52-4518-B32E-016070356A7F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B01E2AE1-1B52-4518-B32E-016070356A7F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B01E2AE1-1B52-4518-B32E-016070356A7F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B01E2AE1-1B52-4518-B32E-016070356A7F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {B51913C2-478E-46AA-A523-521BD4593651}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B51913C2-478E-46AA-A523-521BD4593651}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B51913C2-478E-46AA-A523-521BD4593651}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B51913C2-478E-46AA-A523-521BD4593651}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {1C8F67D6-1953-49D3-B716-F298883A79C6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {1C8F67D6-1953-49D3-B716-F298883A79C6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {1C8F67D6-1953-49D3-B716-F298883A79C6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {1C8F67D6-1953-49D3-B716-F298883A79C6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {6C6F323D-054E-4723-9DEA-1C5E1E45DF88}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6C6F323D-054E-4723-9DEA-1C5E1E45DF88}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6C6F323D-054E-4723-9DEA-1C5E1E45DF88}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6C6F323D-054E-4723-9DEA-1C5E1E45DF88}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {9EDAADA8-B658-430F-97EE-CCA494883D86}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {9EDAADA8-B658-430F-97EE-CCA494883D86}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {9EDAADA8-B658-430F-97EE-CCA494883D86}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {9EDAADA8-B658-430F-97EE-CCA494883D86}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {B01E2AE1-1B52-4518-B32E-016070356A7F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B01E2AE1-1B52-4518-B32E-016070356A7F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B01E2AE1-1B52-4518-B32E-016070356A7F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B01E2AE1-1B52-4518-B32E-016070356A7F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Private.Xml/src/Configurations.props b/src/libraries/System.Private.Xml/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Private.Xml/src/Configurations.props
+++ b/src/libraries/System.Private.Xml/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
index fba6be5..5ba65df 100644 (file)
--- a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
+++ b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
@@ -5,7 +5,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573;649;169;414</NoWarn>
     <DefineConstants>$(DefineConstants);FEATURE_COMPILED_XSL</DefineConstants>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CoreLibSharedDir)System\Text\StringBuilderCache.cs">

diff --git a/src/libraries/System.Private.Xml/tests/Misc/Configurations.props b/src/libraries/System.Private.Xml/tests/Misc/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Misc/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Misc/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj b/src/libraries/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj
index 0c944d6..fcc5035 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>XmlMiscTests</RootNamespace>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="RandomizedHashing.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/Configurations.props b/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj
index 6a45e98..87c1e3f 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CharReaderTests.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/Readers/CustomReader/Configurations.props b/src/libraries/System.Private.Xml/tests/Readers/CustomReader/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/CustomReader/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Readers/CustomReader/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj
index 905e58e..185998b 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CReaderTestModule.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/Configurations.props b/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj
index 59240be..d5fd9ce 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FactoryReaderTests.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/Readers/NameTable/Configurations.props b/src/libraries/System.Private.Xml/tests/Readers/NameTable/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/NameTable/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Readers/NameTable/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj
index cb176fb..b3b50f4 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CNameTableTestModule.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/Configurations.props b/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj
index ac7c728..6e69604 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ConformanceSettings.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/Configurations.props b/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj
index 1c35b27..4df5425 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="InheritedCases.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/Configurations.props b/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj
index a6b4000..70c3079 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="InheritedCases.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/Writers/RwFactory/Configurations.props b/src/libraries/System.Private.Xml/tests/Writers/RwFactory/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Writers/RwFactory/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Writers/RwFactory/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj b/src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj
index 6da209f..cd7da40 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CFactoryModule.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/Configurations.props b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj
index a91bb90..9bacce5 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="EndOfLineHandlingTests.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/XPath/XPathDocument/Configurations.props b/src/libraries/System.Private.Xml/tests/XPath/XPathDocument/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XPath/XPathDocument/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XPath/XPathDocument/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj b/src/libraries/System.Private.Xml/tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj
index 2c9db93..61598a1 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);FEATURE_XML_XPATH_ID</DefineConstants>
     <RootNamespace>System.Xml.XPath.Tests</RootNamespace>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <CommonPathXPath>$(CommonPath)System\Xml\XPath</CommonPathXPath>

diff --git a/src/libraries/System.Private.Xml/tests/XPath/XmlDocument/Configurations.props b/src/libraries/System.Private.Xml/tests/XPath/XmlDocument/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XPath/XmlDocument/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XPath/XmlDocument/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj b/src/libraries/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj
index b5af84f..1bc1977 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);FEATURE_XML_XPATH_ID</DefineConstants>
     <RootNamespace>System.Xml.XPath.XmlDocument.Tests</RootNamespace>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <CommonPathXPath>$(CommonPath)System\Xml\XPath</CommonPathXPath>

diff --git a/src/libraries/System.Private.Xml/tests/XmlConvert/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlConvert/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlConvert/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlConvert/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj
index 91284c5..8908d55 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="EncodeDecodeTests.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/XmlDocument/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlDocument/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlDocument/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlDocument/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj
index 14a52a2..0b573fd 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(CommonTestPath)Tests.props" />
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs">

diff --git a/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/System.Xml.XmlNodeReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/System.Xml.XmlNodeReader.Tests.csproj
index 11e38e7..ece9c9e 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/System.Xml.XmlNodeReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/System.Xml.XmlNodeReader.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(CommonTestPath)Tests.props" />
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NodeReaderTestHelper.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/XmlReader/ReadContentAs/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlReader/ReadContentAs/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlReader/ReadContentAs/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlReader/ReadContentAs/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj
index 28b3ad1..8b8c09e 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(TargetFrameworkVNext)-Debug;$(TargetFrameworkVNext)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ReadAsArrayTests.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/XmlReader/Tests/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlReader/Tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlReader/Tests/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlReader/Tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj
index 2a5d83c..0af6ff8 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AsyncReaderLateInitTests.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj
index 3c808fe..3f93c89 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="XmlSystemPathResolverTests.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/XmlReaderLib/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlReaderLib/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlReaderLib/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlReaderLib/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj b/src/libraries/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj
index a8d9c1d..4dac5bc 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>XmlReaderTest.Common</RootNamespace>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CDataReader.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/System.Xml.XmlResolver.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/System.Xml.XmlResolver.Tests.csproj
index 53ceab7..c7cf997 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/System.Xml.XmlResolver.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/System.Xml.XmlResolver.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(CommonTestPath)Tests.props" />
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <None Include="$(LibrariesProjectRoot)System.Private.Xml\src\Utils\DTDs\XHTML10\no_comments\xhtml1-frameset.dtd">

diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj
index 86e10b2..c14cc67 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CError.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj
index 17486d9..7bc48ba 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Constructor_AddSchema.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlSerializer/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlSerializer/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlSerializer/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/Configurations.props
index 7997802..4fead5c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj
index 7e01891..d7bc135 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);ReflectionOnly</DefineConstants>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Utils.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj
index 9e0e1f4..2385c47 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Utils.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/XmlWriter/Configurations.props b/src/libraries/System.Private.Xml/tests/XmlWriter/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlWriter/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/XmlWriter/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj
index a5e77b1..230926b 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DisposeTests.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/Configurations.props b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj
index 6e1f0c1..31831de 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Errata4.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/Configurations.props b/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj
index 41884f4..df56157 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="cthread.cs" />

diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/Configurations.props b/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/Configurations.props
+++ b/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj b/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj
index 9faa086..0c38b5b 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CommonScenarios\XsltcTestBasicFunctionality.cs" />

diff --git a/src/libraries/System.Reflection.Context/System.Reflection.Context.sln b/src/libraries/System.Reflection.Context/System.Reflection.Context.sln
index 3e23545..805ccb8 100644 (file)
--- a/src/libraries/System.Reflection.Context/System.Reflection.Context.sln
+++ b/src/libraries/System.Reflection.Context/System.Reflection.Context.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {404DB891-B5AF-41E6-B89D-29E3F4573C4F}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {404DB891-B5AF-41E6-B89D-29E3F4573C4F}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {404DB891-B5AF-41E6-B89D-29E3F4573C4F}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Reflection.Context/tests/Configurations.props b/src/libraries/System.Reflection.Context/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Reflection.Context/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Context/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj b/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj
index 8718d63..fcf1b3f 100644 (file)
--- a/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj
+++ b/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CustomAssemblyAttributes.cs" />

diff --git a/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln b/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
index b2fac59..0e7a035 100644 (file)
--- a/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
+++ b/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {1E689C1B-690C-4799-BDE9-6E7990585894}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {1E689C1B-690C-4799-BDE9-6E7990585894}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {1E689C1B-690C-4799-BDE9-6E7990585894}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {1E689C1B-690C-4799-BDE9-6E7990585894}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {1E689C1B-690C-4799-BDE9-6E7990585894}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {1E689C1B-690C-4799-BDE9-6E7990585894}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {1E689C1B-690C-4799-BDE9-6E7990585894}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {1E689C1B-690C-4799-BDE9-6E7990585894}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Reflection.DispatchProxy/ref/Configurations.props b/src/libraries/System.Reflection.DispatchProxy/ref/Configurations.props
index 695058b..c11559c 100644 (file)
--- a/src/libraries/System.Reflection.DispatchProxy/ref/Configurations.props
+++ b/src/libraries/System.Reflection.DispatchProxy/ref/Configurations.props
@@ -5,7 +5,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj b/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj
index ec1035f..bc74ed2 100644 (file)
--- a/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj
+++ b/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Reflection.DispatchProxy/src/Configurations.props b/src/libraries/System.Reflection.DispatchProxy/src/Configurations.props
index 3061f2a..6cb0834 100644 (file)
--- a/src/libraries/System.Reflection.DispatchProxy/src/Configurations.props
+++ b/src/libraries/System.Reflection.DispatchProxy/src/Configurations.props
@@ -7,8 +7,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj b/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
index de82669..3304b67 100644 (file)
--- a/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
+++ b/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <!-- this library depends on Ref.Emit which is not available for netstandard -->
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_ReflectionDispatchProxy</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp2.0-Debug;netcoreapp2.0-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp2.0-Debug;netcoreapp2.0-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' != 'true'">

diff --git a/src/libraries/System.Reflection.DispatchProxy/tests/Configurations.props b/src/libraries/System.Reflection.DispatchProxy/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Reflection.DispatchProxy/tests/Configurations.props
+++ b/src/libraries/System.Reflection.DispatchProxy/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj b/src/libraries/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj
index 61d5318..78c2a8f 100644 (file)
--- a/src/libraries/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj
+++ b/src/libraries/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DispatchProxyTests.cs" />

diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln b/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln
index 201f681..d656bc4 100644 (file)
--- a/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {FB037640-0591-4DF4-A331-0BEFE50A200B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {FB037640-0591-4DF4-A331-0BEFE50A200B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {FB037640-0591-4DF4-A331-0BEFE50A200B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {FB037640-0591-4DF4-A331-0BEFE50A200B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {D8763A34-58C6-4229-AD75-6980EF382294}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D8763A34-58C6-4229-AD75-6980EF382294}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D8763A34-58C6-4229-AD75-6980EF382294}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D8763A34-58C6-4229-AD75-6980EF382294}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {FB037640-0591-4DF4-A331-0BEFE50A200B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {FB037640-0591-4DF4-A331-0BEFE50A200B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {FB037640-0591-4DF4-A331-0BEFE50A200B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {FB037640-0591-4DF4-A331-0BEFE50A200B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D8763A34-58C6-4229-AD75-6980EF382294}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D8763A34-58C6-4229-AD75-6980EF382294}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D8763A34-58C6-4229-AD75-6980EF382294}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D8763A34-58C6-4229-AD75-6980EF382294}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/ref/Configurations.props b/src/libraries/System.Reflection.Emit.ILGeneration/ref/Configurations.props
index 68bafe2..a6e5476 100644 (file)
--- a/src/libraries/System.Reflection.Emit.ILGeneration/ref/Configurations.props
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/ref/Configurations.props
@@ -5,9 +5,9 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
-      <!-- Use inbox facade on netfx -->
-      _netfx;
+      $(NetCoreAppCurrent);
+      <!-- Use inbox facade on $(NetFrameworkCurrent) -->
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj b/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj
index cba2464..5eacc5c 100644 (file)
--- a/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/src/Configurations.props b/src/libraries/System.Reflection.Emit.ILGeneration/src/Configurations.props
index 4609ba0..8831f2e 100644 (file)
--- a/src/libraries/System.Reflection.Emit.ILGeneration/src/Configurations.props
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/src/Configurations.props
@@ -5,8 +5,8 @@
       netstandard1.0;
     </PackageConfigurations>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
       $(PackageConfigurations);
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj b/src/libraries/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj
index 2d128cf..cf58d21 100644 (file)
--- a/src/libraries/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj
@@ -4,7 +4,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetsNetStandard)' != 'true'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_RefEmitILGeneration</GeneratePlatformNotSupportedAssemblyMessage>
     <OmitResources>$(IsPartialFacadeAssembly)</OmitResources>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'">

diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/tests/Configurations.props b/src/libraries/System.Reflection.Emit.ILGeneration/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Reflection.Emit.ILGeneration/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj b/src/libraries/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj
index ebc4ffe..f5dc108 100644 (file)
--- a/src/libraries/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln b/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln
index 2722531..bc3028f 100644 (file)
--- a/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln
+++ b/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Reflection.Emit.Lightweight/ref/Configurations.props b/src/libraries/System.Reflection.Emit.Lightweight/ref/Configurations.props
index 68bafe2..a6e5476 100644 (file)
--- a/src/libraries/System.Reflection.Emit.Lightweight/ref/Configurations.props
+++ b/src/libraries/System.Reflection.Emit.Lightweight/ref/Configurations.props
@@ -5,9 +5,9 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
-      <!-- Use inbox facade on netfx -->
-      _netfx;
+      $(NetCoreAppCurrent);
+      <!-- Use inbox facade on $(NetFrameworkCurrent) -->
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj b/src/libraries/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj
index 7200f6d..d515ef5 100644 (file)
--- a/src/libraries/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj
+++ b/src/libraries/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/libraries/System.Reflection.Emit.Lightweight/src/Configurations.props b/src/libraries/System.Reflection.Emit.Lightweight/src/Configurations.props
index 4609ba0..8831f2e 100644 (file)
--- a/src/libraries/System.Reflection.Emit.Lightweight/src/Configurations.props
+++ b/src/libraries/System.Reflection.Emit.Lightweight/src/Configurations.props
@@ -5,8 +5,8 @@
       netstandard1.0;
     </PackageConfigurations>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
       $(PackageConfigurations);
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj b/src/libraries/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj
index 3763c42..3d1d4b7 100644 (file)
--- a/src/libraries/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj
+++ b/src/libraries/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj
@@ -5,7 +5,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetsNetStandard)' != 'true'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_RefEmitLightweight</GeneratePlatformNotSupportedAssemblyMessage>
     <OmitResources>$(IsPartialFacadeAssembly)</OmitResources>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'">

diff --git a/src/libraries/System.Reflection.Emit.Lightweight/tests/Configurations.props b/src/libraries/System.Reflection.Emit.Lightweight/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Reflection.Emit.Lightweight/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Emit.Lightweight/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj b/src/libraries/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj
index 15bb61d..c2226d2 100644 (file)
--- a/src/libraries/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj
+++ b/src/libraries/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln b/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln
index 99a449a..4a1001d 100644 (file)
--- a/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln
+++ b/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {1104A263-331A-4CA0-B541-759BD20F7B1D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {1104A263-331A-4CA0-B541-759BD20F7B1D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {1104A263-331A-4CA0-B541-759BD20F7B1D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {1104A263-331A-4CA0-B541-759BD20F7B1D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {19D670F6-6029-43DB-9F43-CB291EB358F4}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {19D670F6-6029-43DB-9F43-CB291EB358F4}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {19D670F6-6029-43DB-9F43-CB291EB358F4}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {19D670F6-6029-43DB-9F43-CB291EB358F4}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {4FBD1556-7B96-414E-9EA4-85281956D60E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4FBD1556-7B96-414E-9EA4-85281956D60E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4FBD1556-7B96-414E-9EA4-85281956D60E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4FBD1556-7B96-414E-9EA4-85281956D60E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {1104A263-331A-4CA0-B541-759BD20F7B1D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {1104A263-331A-4CA0-B541-759BD20F7B1D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {1104A263-331A-4CA0-B541-759BD20F7B1D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {1104A263-331A-4CA0-B541-759BD20F7B1D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {19D670F6-6029-43DB-9F43-CB291EB358F4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {19D670F6-6029-43DB-9F43-CB291EB358F4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {19D670F6-6029-43DB-9F43-CB291EB358F4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {19D670F6-6029-43DB-9F43-CB291EB358F4}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4FBD1556-7B96-414E-9EA4-85281956D60E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4FBD1556-7B96-414E-9EA4-85281956D60E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4FBD1556-7B96-414E-9EA4-85281956D60E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4FBD1556-7B96-414E-9EA4-85281956D60E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Reflection.Emit/ref/Configurations.props b/src/libraries/System.Reflection.Emit/ref/Configurations.props
index 68bafe2..a6e5476 100644 (file)
--- a/src/libraries/System.Reflection.Emit/ref/Configurations.props
+++ b/src/libraries/System.Reflection.Emit/ref/Configurations.props
@@ -5,9 +5,9 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
-      <!-- Use inbox facade on netfx -->
-      _netfx;
+      $(NetCoreAppCurrent);
+      <!-- Use inbox facade on $(NetFrameworkCurrent) -->
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.Emit/ref/System.Reflection.Emit.csproj b/src/libraries/System.Reflection.Emit/ref/System.Reflection.Emit.csproj
index 1637fce..c223f30 100644 (file)
--- a/src/libraries/System.Reflection.Emit/ref/System.Reflection.Emit.csproj
+++ b/src/libraries/System.Reflection.Emit/ref/System.Reflection.Emit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Reflection.Emit/src/Configurations.props b/src/libraries/System.Reflection.Emit/src/Configurations.props
index 9653f71..9f7e388 100644 (file)
--- a/src/libraries/System.Reflection.Emit/src/Configurations.props
+++ b/src/libraries/System.Reflection.Emit/src/Configurations.props
@@ -5,8 +5,8 @@
       netstandard1.1;
     </PackageConfigurations>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
       $(PackageConfigurations);
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/System.Reflection.Emit/src/System.Reflection.Emit.csproj b/src/libraries/System.Reflection.Emit/src/System.Reflection.Emit.csproj
index d068dcf..62efb31 100644 (file)
--- a/src/libraries/System.Reflection.Emit/src/System.Reflection.Emit.csproj
+++ b/src/libraries/System.Reflection.Emit/src/System.Reflection.Emit.csproj
@@ -4,7 +4,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetsNetStandard)' != 'true'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_RefEmit</GeneratePlatformNotSupportedAssemblyMessage>
     <OmitResources>$(IsPartialFacadeAssembly)</OmitResources>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'">

diff --git a/src/libraries/System.Reflection.Emit/tests/Configurations.props b/src/libraries/System.Reflection.Emit/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Reflection.Emit/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Emit/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj b/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj
index 3b2680e..1199277 100644 (file)
--- a/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj
+++ b/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln b/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln
index a8fcaef..d2b947b 100644 (file)
--- a/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln
+++ b/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {26699AB1-DBAC-4819-A1C0-185AB37CF127}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {26699AB1-DBAC-4819-A1C0-185AB37CF127}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {26699AB1-DBAC-4819-A1C0-185AB37CF127}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {26699AB1-DBAC-4819-A1C0-185AB37CF127}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {72E89A6C-1F60-4170-AB7B-14AAD82E293D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {72E89A6C-1F60-4170-AB7B-14AAD82E293D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {72E89A6C-1F60-4170-AB7B-14AAD82E293D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {72E89A6C-1F60-4170-AB7B-14AAD82E293D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {26699AB1-DBAC-4819-A1C0-185AB37CF127}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {26699AB1-DBAC-4819-A1C0-185AB37CF127}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {26699AB1-DBAC-4819-A1C0-185AB37CF127}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {26699AB1-DBAC-4819-A1C0-185AB37CF127}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {72E89A6C-1F60-4170-AB7B-14AAD82E293D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {72E89A6C-1F60-4170-AB7B-14AAD82E293D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {72E89A6C-1F60-4170-AB7B-14AAD82E293D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {72E89A6C-1F60-4170-AB7B-14AAD82E293D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Reflection.Extensions/ref/Configurations.props b/src/libraries/System.Reflection.Extensions/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Reflection.Extensions/ref/Configurations.props
+++ b/src/libraries/System.Reflection.Extensions/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj b/src/libraries/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj
index 923eaab..518f45d 100644 (file)
--- a/src/libraries/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj
+++ b/src/libraries/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.Extensions.cs" />

diff --git a/src/libraries/System.Reflection.Extensions/src/Configurations.props b/src/libraries/System.Reflection.Extensions/src/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Reflection.Extensions/src/Configurations.props
+++ b/src/libraries/System.Reflection.Extensions/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj b/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj
index 38b330b..d318392 100644 (file)
--- a/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj
+++ b/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Reflection.Extensions</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Runtime" />

diff --git a/src/libraries/System.Reflection.Extensions/tests/Configurations.props b/src/libraries/System.Reflection.Extensions/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Reflection.Extensions/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Extensions/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj b/src/libraries/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj
index aab4562..ef9a008 100644 (file)
--- a/src/libraries/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj
+++ b/src/libraries/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln b/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
index a0abbae..2350c03 100644 (file)
--- a/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
+++ b/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {F3E433C8-352F-4944-BF7F-765CE435370D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F3E433C8-352F-4944-BF7F-765CE435370D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F3E433C8-352F-4944-BF7F-765CE435370D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F3E433C8-352F-4944-BF7F-765CE435370D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {69B25962-B4C2-4295-8809-5653CD03FC75}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {69B25962-B4C2-4295-8809-5653CD03FC75}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {69B25962-B4C2-4295-8809-5653CD03FC75}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {69B25962-B4C2-4295-8809-5653CD03FC75}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {F3E433C8-352F-4944-BF7F-765CE435370D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F3E433C8-352F-4944-BF7F-765CE435370D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F3E433C8-352F-4944-BF7F-765CE435370D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F3E433C8-352F-4944-BF7F-765CE435370D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {69B25962-B4C2-4295-8809-5653CD03FC75}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {69B25962-B4C2-4295-8809-5653CD03FC75}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {69B25962-B4C2-4295-8809-5653CD03FC75}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {69B25962-B4C2-4295-8809-5653CD03FC75}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Reflection.Metadata/ref/Configurations.props b/src/libraries/System.Reflection.Metadata/ref/Configurations.props
index e520790..64bee43 100644 (file)
--- a/src/libraries/System.Reflection.Metadata/ref/Configurations.props
+++ b/src/libraries/System.Reflection.Metadata/ref/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj
index 0279a62..fde9f2a 100644 (file)
--- a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj
+++ b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLSCompliant>false</CLSCompliant>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.Metadata.cs" />

diff --git a/src/libraries/System.Reflection.Metadata/src/Configurations.props b/src/libraries/System.Reflection.Metadata/src/Configurations.props
index e520790..64bee43 100644 (file)
--- a/src/libraries/System.Reflection.Metadata/src/Configurations.props
+++ b/src/libraries/System.Reflection.Metadata/src/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj
index 19ca6c5..fcfb202 100644 (file)
--- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj
+++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj
@@ -5,7 +5,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <CLSCompliant>false</CLSCompliant>
     <PackageTargetFramework Condition="'$(TargetFramework)' == 'netstandard1.1'">netstandard1.1;portable-net45+win8</PackageTargetFramework>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">

diff --git a/src/libraries/System.Reflection.Metadata/tests/Configurations.props b/src/libraries/System.Reflection.Metadata/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Reflection.Metadata/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Metadata/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
index 9f736ad..99b1c37 100644 (file)
--- a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
+++ b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ExternallyShipping>false</ExternallyShipping>
     <NoWarn>436</NoWarn> <!-- Type conflicts on "Interop" due to InternalsVisibleTo access -->
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">

diff --git a/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln b/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
index 833c4f8..f912e17 100644 (file)
--- a/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
+++ b/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {443B7659-B3FA-4B32-88BA-3A0517E21018}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {443B7659-B3FA-4B32-88BA-3A0517E21018}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {443B7659-B3FA-4B32-88BA-3A0517E21018}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {443B7659-B3FA-4B32-88BA-3A0517E21018}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {DBB18588-DD89-4F41-9852-484FD4726F0F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {DBB18588-DD89-4F41-9852-484FD4726F0F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {DBB18588-DD89-4F41-9852-484FD4726F0F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {DBB18588-DD89-4F41-9852-484FD4726F0F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {443B7659-B3FA-4B32-88BA-3A0517E21018}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {443B7659-B3FA-4B32-88BA-3A0517E21018}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {443B7659-B3FA-4B32-88BA-3A0517E21018}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {443B7659-B3FA-4B32-88BA-3A0517E21018}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {DBB18588-DD89-4F41-9852-484FD4726F0F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {DBB18588-DD89-4F41-9852-484FD4726F0F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {DBB18588-DD89-4F41-9852-484FD4726F0F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {DBB18588-DD89-4F41-9852-484FD4726F0F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {EC84D608-71BC-4FE4-86C8-CA30F3B0CC7D}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {EC84D608-71BC-4FE4-86C8-CA30F3B0CC7D}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {EC84D608-71BC-4FE4-86C8-CA30F3B0CC7D}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/Configurations.props b/src/libraries/System.Reflection.MetadataLoadContext/src/Configurations.props
index e70c450..c251fdc 100644 (file)
--- a/src/libraries/System.Reflection.MetadataLoadContext/src/Configurations.props
+++ b/src/libraries/System.Reflection.MetadataLoadContext/src/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj
index 9f6dc6f..241d33c 100644 (file)
--- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj
+++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj
@@ -5,7 +5,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573</NoWarn>
     <!-- Only the netcoreapp version supports the new reflection apis (IsSZArray, etc.) -->
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\CoreRtBridge.cs" />

diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/Configurations.props b/src/libraries/System.Reflection.MetadataLoadContext/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Reflection.MetadataLoadContext/tests/Configurations.props
+++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj b/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj
index 3e78bca..8e6f789 100644 (file)
--- a/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj
+++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs">

diff --git a/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln b/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln
index 6415e49..a380317 100644 (file)
--- a/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln
+++ b/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln
@@ -19,14 +19,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {CCE47F37-2C51-44EB-8F54-0474D7831515}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {CCE47F37-2C51-44EB-8F54-0474D7831515}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {CCE47F37-2C51-44EB-8F54-0474D7831515}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {CCE47F37-2C51-44EB-8F54-0474D7831515}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F512184F-76E5-4AE5-8AB5-395AF9D18712}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F512184F-76E5-4AE5-8AB5-395AF9D18712}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F512184F-76E5-4AE5-8AB5-395AF9D18712}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F512184F-76E5-4AE5-8AB5-395AF9D18712}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {CCE47F37-2C51-44EB-8F54-0474D7831515}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {CCE47F37-2C51-44EB-8F54-0474D7831515}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {CCE47F37-2C51-44EB-8F54-0474D7831515}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {CCE47F37-2C51-44EB-8F54-0474D7831515}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F512184F-76E5-4AE5-8AB5-395AF9D18712}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F512184F-76E5-4AE5-8AB5-395AF9D18712}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F512184F-76E5-4AE5-8AB5-395AF9D18712}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F512184F-76E5-4AE5-8AB5-395AF9D18712}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Reflection.Primitives/ref/Configurations.props b/src/libraries/System.Reflection.Primitives/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Reflection.Primitives/ref/Configurations.props
+++ b/src/libraries/System.Reflection.Primitives/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj b/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj
index c521133..4e7be5b 100644 (file)
--- a/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj
+++ b/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Reflection.Primitives/src/Configurations.props b/src/libraries/System.Reflection.Primitives/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Reflection.Primitives/src/Configurations.props
+++ b/src/libraries/System.Reflection.Primitives/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj b/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
index 016f39d..6882ffe 100644 (file)
--- a/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
+++ b/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Reflection.Primitives</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln b/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
index 1242730..66006bb 100644 (file)
--- a/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
+++ b/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
@@ -31,18 +31,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {BED9F8D5-7420-404E-9EAD-D9148C16EAC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {BED9F8D5-7420-404E-9EAD-D9148C16EAC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {BED9F8D5-7420-404E-9EAD-D9148C16EAC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {BED9F8D5-7420-404E-9EAD-D9148C16EAC1}.Release|Any CPU.Build.0 = Release|Any CPU
-               {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {C303A051-8D54-4460-8BFD-DE10F0473BDB}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {C303A051-8D54-4460-8BFD-DE10F0473BDB}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {C303A051-8D54-4460-8BFD-DE10F0473BDB}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Reflection.TypeExtensions/ref/Configurations.props b/src/libraries/System.Reflection.TypeExtensions/ref/Configurations.props
index e34056e..b4029b3 100644 (file)
--- a/src/libraries/System.Reflection.TypeExtensions/ref/Configurations.props
+++ b/src/libraries/System.Reflection.TypeExtensions/ref/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      netfx;
+      $(NetFrameworkCurrent);
       net461;
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj b/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj
index d261f9e..cee31f5 100644 (file)
--- a/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj
+++ b/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.TypeExtensions.cs" />

diff --git a/src/libraries/System.Reflection.TypeExtensions/src/Configurations.props b/src/libraries/System.Reflection.TypeExtensions/src/Configurations.props
index a136465..44811b4 100644 (file)
--- a/src/libraries/System.Reflection.TypeExtensions/src/Configurations.props
+++ b/src/libraries/System.Reflection.TypeExtensions/src/Configurations.props
@@ -8,9 +8,9 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx;
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetFrameworkCurrent);
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj b/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
index a477c0b..69077b0 100644 (file)
--- a/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
+++ b/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Reflection.TypeExtensions</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <Nullable>enable</Nullable>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release;netstandard1.5-Debug;netstandard1.5-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release;netstandard1.5-Debug;netstandard1.5-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard1.5'">
     <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_ReflectionTypeExtensions</GeneratePlatformNotSupportedAssemblyMessage>

diff --git a/src/libraries/System.Reflection.TypeExtensions/tests/Configurations.props b/src/libraries/System.Reflection.TypeExtensions/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Reflection.TypeExtensions/tests/Configurations.props
+++ b/src/libraries/System.Reflection.TypeExtensions/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj b/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj
index ea64f4b..b55aa2b 100644 (file)
--- a/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj
+++ b/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">

diff --git a/src/libraries/System.Reflection/System.Reflection.sln b/src/libraries/System.Reflection/System.Reflection.sln
index 65925ca..601bf5d 100644 (file)
--- a/src/libraries/System.Reflection/System.Reflection.sln
+++ b/src/libraries/System.Reflection/System.Reflection.sln
@@ -106,10 +106,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {5B003EB4-DD06-4BC6-B2E9-A9F0E445CB86}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {5B003EB4-DD06-4BC6-B2E9-A9F0E445CB86}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {5B003EB4-DD06-4BC6-B2E9-A9F0E445CB86}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
@@ -154,10 +154,10 @@ Global
                {42E66302-6F46-47BE-936B-4264DFD6004F}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {42E66302-6F46-47BE-936B-4264DFD6004F}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
                {42E66302-6F46-47BE-936B-4264DFD6004F}.Release|Any CPU.Build.0 = netstandard2.0-Release|Any CPU
-               {C8049356-559D-4F34-AC17-56F3AE62C897}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C8049356-559D-4F34-AC17-56F3AE62C897}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C8049356-559D-4F34-AC17-56F3AE62C897}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C8049356-559D-4F34-AC17-56F3AE62C897}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {C8049356-559D-4F34-AC17-56F3AE62C897}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C8049356-559D-4F34-AC17-56F3AE62C897}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C8049356-559D-4F34-AC17-56F3AE62C897}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C8049356-559D-4F34-AC17-56F3AE62C897}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {FA12CC14-C4A5-495D-B7AA-651E4BCC1027}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {FA12CC14-C4A5-495D-B7AA-651E4BCC1027}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {FA12CC14-C4A5-495D-B7AA-651E4BCC1027}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
@@ -166,22 +166,22 @@ Global
                {0CD33916-DD1D-4DF3-B579-2896ACE43E45}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {0CD33916-DD1D-4DF3-B579-2896ACE43E45}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
                {0CD33916-DD1D-4DF3-B579-2896ACE43E45}.Release|Any CPU.Build.0 = netstandard2.0-Release|Any CPU
-               {8C19B991-41E9-4B38-9602-E19375397F1D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {8C19B991-41E9-4B38-9602-E19375397F1D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {8C19B991-41E9-4B38-9602-E19375397F1D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {8C19B991-41E9-4B38-9602-E19375397F1D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {8C19B991-41E9-4B38-9602-E19375397F1D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {8C19B991-41E9-4B38-9602-E19375397F1D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {8C19B991-41E9-4B38-9602-E19375397F1D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {8C19B991-41E9-4B38-9602-E19375397F1D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {7FFD1B55-D69A-4469-B775-6CBEB1CE50B0}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {7FFD1B55-D69A-4469-B775-6CBEB1CE50B0}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {7FFD1B55-D69A-4469-B775-6CBEB1CE50B0}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
                {7FFD1B55-D69A-4469-B775-6CBEB1CE50B0}.Release|Any CPU.Build.0 = netstandard2.0-Release|Any CPU
-               {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Reflection/ref/Configurations.props b/src/libraries/System.Reflection/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Reflection/ref/Configurations.props
+++ b/src/libraries/System.Reflection/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection/ref/System.Reflection.csproj b/src/libraries/System.Reflection/ref/System.Reflection.csproj
index d94bfdf..a5ec6b4 100644 (file)
--- a/src/libraries/System.Reflection/ref/System.Reflection.csproj
+++ b/src/libraries/System.Reflection/ref/System.Reflection.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.cs" />

diff --git a/src/libraries/System.Reflection/src/Configurations.props b/src/libraries/System.Reflection/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Reflection/src/Configurations.props
+++ b/src/libraries/System.Reflection/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Reflection/src/System.Reflection.csproj b/src/libraries/System.Reflection/src/System.Reflection.csproj
index cce5365..3763294 100644 (file)
--- a/src/libraries/System.Reflection/src/System.Reflection.csproj
+++ b/src/libraries/System.Reflection/src/System.Reflection.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Reflection</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Reflection/tests/Configurations.props b/src/libraries/System.Reflection/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Reflection/tests/Configurations.props
+++ b/src/libraries/System.Reflection/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection/tests/CoreCLR/Configurations.props b/src/libraries/System.Reflection/tests/CoreCLR/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Reflection/tests/CoreCLR/Configurations.props
+++ b/src/libraries/System.Reflection/tests/CoreCLR/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj b/src/libraries/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj
index 9b10dc4..dffdcde 100644 (file)
--- a/src/libraries/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj
+++ b/src/libraries/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj b/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj
index 2d56093..39548d7 100644 (file)
--- a/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj
+++ b/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
     <!-- LoadFrom_SameIdentityAsAssemblyWithDifferentPath_ReturnsEqualAssemblies test relies on no deps.json -->
     <GenerateDependencyFile>false</GenerateDependencyFile>

diff --git a/src/libraries/System.Reflection/tests/TestExe/Configurations.props b/src/libraries/System.Reflection/tests/TestExe/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Reflection/tests/TestExe/Configurations.props
+++ b/src/libraries/System.Reflection/tests/TestExe/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj b/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj
index c55e390..e38b56d 100644 (file)
--- a/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj
+++ b/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />

diff --git a/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln b/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln
index 241a164..77dfb1d 100644 (file)
--- a/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln
+++ b/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {9003846C-EE54-4E58-B01E-6AA177E046C5}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {9003846C-EE54-4E58-B01E-6AA177E046C5}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {9003846C-EE54-4E58-B01E-6AA177E046C5}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {9003846C-EE54-4E58-B01E-6AA177E046C5}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {9003846C-EE54-4E58-B01E-6AA177E046C5}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {9003846C-EE54-4E58-B01E-6AA177E046C5}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {9003846C-EE54-4E58-B01E-6AA177E046C5}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {9003846C-EE54-4E58-B01E-6AA177E046C5}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {6773D354-A573-4D9C-9A67-C7FAE579DA50}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {6773D354-A573-4D9C-9A67-C7FAE579DA50}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {6773D354-A573-4D9C-9A67-C7FAE579DA50}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Resources.Extensions/tests/Configurations.props b/src/libraries/System.Resources.Extensions/tests/Configurations.props
index 1a037ad..f550cb3 100644 (file)
--- a/src/libraries/System.Resources.Extensions/tests/Configurations.props
+++ b/src/libraries/System.Resources.Extensions/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
index 6673347..e044f3a 100644 (file)
--- a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
+++ b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Resources.Reader/System.Resources.Reader.sln b/src/libraries/System.Resources.Reader/System.Resources.Reader.sln
index 129492f..d5bcc8c 100644 (file)
--- a/src/libraries/System.Resources.Reader/System.Resources.Reader.sln
+++ b/src/libraries/System.Resources.Reader/System.Resources.Reader.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {8D7202E8-084A-4C20-AB93-3BF70D2E0651}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {8D7202E8-084A-4C20-AB93-3BF70D2E0651}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {8D7202E8-084A-4C20-AB93-3BF70D2E0651}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {8D7202E8-084A-4C20-AB93-3BF70D2E0651}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {5C13260D-C55D-46AF-9DCB-1B015D48E2E4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {5C13260D-C55D-46AF-9DCB-1B015D48E2E4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {5C13260D-C55D-46AF-9DCB-1B015D48E2E4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {5C13260D-C55D-46AF-9DCB-1B015D48E2E4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {99A66A70-7055-48FC-9BE1-36ED2B392E0D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {99A66A70-7055-48FC-9BE1-36ED2B392E0D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {99A66A70-7055-48FC-9BE1-36ED2B392E0D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {99A66A70-7055-48FC-9BE1-36ED2B392E0D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {8D7202E8-084A-4C20-AB93-3BF70D2E0651}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {8D7202E8-084A-4C20-AB93-3BF70D2E0651}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {8D7202E8-084A-4C20-AB93-3BF70D2E0651}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {8D7202E8-084A-4C20-AB93-3BF70D2E0651}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {5C13260D-C55D-46AF-9DCB-1B015D48E2E4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {5C13260D-C55D-46AF-9DCB-1B015D48E2E4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {5C13260D-C55D-46AF-9DCB-1B015D48E2E4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {5C13260D-C55D-46AF-9DCB-1B015D48E2E4}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {99A66A70-7055-48FC-9BE1-36ED2B392E0D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {99A66A70-7055-48FC-9BE1-36ED2B392E0D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {99A66A70-7055-48FC-9BE1-36ED2B392E0D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {99A66A70-7055-48FC-9BE1-36ED2B392E0D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Resources.Reader/ref/Configurations.props b/src/libraries/System.Resources.Reader/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Resources.Reader/ref/Configurations.props
+++ b/src/libraries/System.Resources.Reader/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Resources.Reader/ref/System.Resources.Reader.csproj b/src/libraries/System.Resources.Reader/ref/System.Resources.Reader.csproj
index b6a036a..9d57ba4 100644 (file)
--- a/src/libraries/System.Resources.Reader/ref/System.Resources.Reader.csproj
+++ b/src/libraries/System.Resources.Reader/ref/System.Resources.Reader.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Resources.Reader.cs" />

diff --git a/src/libraries/System.Resources.Reader/src/Configurations.props b/src/libraries/System.Resources.Reader/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Resources.Reader/src/Configurations.props
+++ b/src/libraries/System.Resources.Reader/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Resources.Reader/src/System.Resources.Reader.csproj b/src/libraries/System.Resources.Reader/src/System.Resources.Reader.csproj
index d38d008..70e7eac 100644 (file)
--- a/src/libraries/System.Resources.Reader/src/System.Resources.Reader.csproj
+++ b/src/libraries/System.Resources.Reader/src/System.Resources.Reader.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>System.Resources.Reader</AssemblyName>
     <RootNamespace>System.Resources</RootNamespace>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Resources.ResourceManager" />

diff --git a/src/libraries/System.Resources.Reader/tests/Configurations.props b/src/libraries/System.Resources.Reader/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Resources.Reader/tests/Configurations.props
+++ b/src/libraries/System.Resources.Reader/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj b/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj
index dbe02dd..1d97520 100644 (file)
--- a/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj
+++ b/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(CommonTestPath)Tests.props" />
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln b/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln
index f9dce38..39c681c 100644 (file)
--- a/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln
+++ b/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {3E7810B2-2802-4867-B223-30427F3F2D5B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {3E7810B2-2802-4867-B223-30427F3F2D5B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {3E7810B2-2802-4867-B223-30427F3F2D5B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {3E7810B2-2802-4867-B223-30427F3F2D5B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {97CFE337-C57E-4B2E-B495-65B917E1282E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {97CFE337-C57E-4B2E-B495-65B917E1282E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {97CFE337-C57E-4B2E-B495-65B917E1282E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {97CFE337-C57E-4B2E-B495-65B917E1282E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {3E7810B2-2802-4867-B223-30427F3F2D5B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {3E7810B2-2802-4867-B223-30427F3F2D5B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {3E7810B2-2802-4867-B223-30427F3F2D5B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {3E7810B2-2802-4867-B223-30427F3F2D5B}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {97CFE337-C57E-4B2E-B495-65B917E1282E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {97CFE337-C57E-4B2E-B495-65B917E1282E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {97CFE337-C57E-4B2E-B495-65B917E1282E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {97CFE337-C57E-4B2E-B495-65B917E1282E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Resources.ResourceManager/ref/Configurations.props b/src/libraries/System.Resources.ResourceManager/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Resources.ResourceManager/ref/Configurations.props
+++ b/src/libraries/System.Resources.ResourceManager/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj b/src/libraries/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj
index 1924ed3..d7c699f 100644 (file)
--- a/src/libraries/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj
+++ b/src/libraries/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Resources.ResourceManager/src/Configurations.props b/src/libraries/System.Resources.ResourceManager/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Resources.ResourceManager/src/Configurations.props
+++ b/src/libraries/System.Resources.ResourceManager/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj b/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj
index 1672be4..f8140ad 100644 (file)
--- a/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj
+++ b/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Resources.ResourceManager</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Diagnostics.Tools" />

diff --git a/src/libraries/System.Resources.ResourceManager/tests/Configurations.props b/src/libraries/System.Resources.ResourceManager/tests/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Resources.ResourceManager/tests/Configurations.props
+++ b/src/libraries/System.Resources.ResourceManager/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
index de53217..b04102e 100644 (file)
--- a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
+++ b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
@@ -4,7 +4,7 @@
     <BinPlaceSatelliteAssemblies>true</BinPlaceSatelliteAssemblies>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="MissingManifestResourceExceptionTests.cs" />

diff --git a/src/libraries/System.Resources.Writer/System.Resources.Writer.sln b/src/libraries/System.Resources.Writer/System.Resources.Writer.sln
index afc8a48..b12136b 100644 (file)
--- a/src/libraries/System.Resources.Writer/System.Resources.Writer.sln
+++ b/src/libraries/System.Resources.Writer/System.Resources.Writer.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {EFA745C2-3741-4D54-B2A1-1979E43354E4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {EFA745C2-3741-4D54-B2A1-1979E43354E4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {EFA745C2-3741-4D54-B2A1-1979E43354E4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {EFA745C2-3741-4D54-B2A1-1979E43354E4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {EFA745C2-3741-4D54-B2A1-1979E43354E4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {EFA745C2-3741-4D54-B2A1-1979E43354E4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {EFA745C2-3741-4D54-B2A1-1979E43354E4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {EFA745C2-3741-4D54-B2A1-1979E43354E4}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Resources.Writer/ref/Configurations.props b/src/libraries/System.Resources.Writer/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Resources.Writer/ref/Configurations.props
+++ b/src/libraries/System.Resources.Writer/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Resources.Writer/ref/System.Resources.Writer.csproj b/src/libraries/System.Resources.Writer/ref/System.Resources.Writer.csproj
index 9bbe079..48c8a68 100644 (file)
--- a/src/libraries/System.Resources.Writer/ref/System.Resources.Writer.csproj
+++ b/src/libraries/System.Resources.Writer/ref/System.Resources.Writer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Resources.Writer.cs" />

diff --git a/src/libraries/System.Resources.Writer/src/Configurations.props b/src/libraries/System.Resources.Writer/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Resources.Writer/src/Configurations.props
+++ b/src/libraries/System.Resources.Writer/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Resources.Writer/src/System.Resources.Writer.csproj b/src/libraries/System.Resources.Writer/src/System.Resources.Writer.csproj
index 50785a2..81a7916 100644 (file)
--- a/src/libraries/System.Resources.Writer/src/System.Resources.Writer.csproj
+++ b/src/libraries/System.Resources.Writer/src/System.Resources.Writer.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>System.Resources.Writer</AssemblyName>
     <RootNamespace>System.Resources</RootNamespace>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Resources\__FastResourceComparer.cs" />

diff --git a/src/libraries/System.Resources.Writer/tests/Configurations.props b/src/libraries/System.Resources.Writer/tests/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Resources.Writer/tests/Configurations.props
+++ b/src/libraries/System.Resources.Writer/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj b/src/libraries/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj
index 0a9948a..73c4006 100644 (file)
--- a/src/libraries/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj
+++ b/src/libraries/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ResourceWriterUnitTest.cs" />

diff --git a/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln b/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln
index 4075e88..9c175ad 100644 (file)
--- a/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln
+++ b/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {397E49A7-EB26-4368-8F46-D78B98F4A971}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {397E49A7-EB26-4368-8F46-D78B98F4A971}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {397E49A7-EB26-4368-8F46-D78B98F4A971}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {397E49A7-EB26-4368-8F46-D78B98F4A971}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {397E49A7-EB26-4368-8F46-D78B98F4A971}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {397E49A7-EB26-4368-8F46-D78B98F4A971}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {397E49A7-EB26-4368-8F46-D78B98F4A971}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {397E49A7-EB26-4368-8F46-D78B98F4A971}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {A7B6FB6E-F484-42D7-8A5E-F7D0DCC03829}.Debug|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Debug|Any CPU
                {A7B6FB6E-F484-42D7-8A5E-F7D0DCC03829}.Debug|Any CPU.Build.0 = netstandard2.0-Windows_NT-Debug|Any CPU
                {A7B6FB6E-F484-42D7-8A5E-F7D0DCC03829}.Release|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Release|Any CPU

diff --git a/src/libraries/System.Runtime.Caching/src/Configurations.props b/src/libraries/System.Runtime.Caching/src/Configurations.props
index 02c3fed..864e8bc 100644 (file)
--- a/src/libraries/System.Runtime.Caching/src/Configurations.props
+++ b/src/libraries/System.Runtime.Caching/src/Configurations.props
@@ -3,7 +3,7 @@
     <BuildConfigurations>
       netstandard2.0;
       netstandard2.0-Windows_NT;
-      _netfx;
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Caching/tests/Configurations.props b/src/libraries/System.Runtime.Caching/tests/Configurations.props
index 2afdc55..4dbe0ad 100644 (file)
--- a/src/libraries/System.Runtime.Caching/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Caching/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj b/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj
index 66b16ea..5a7e44e 100644 (file)
--- a/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj
+++ b/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AdditionalCacheTests\AdditionalCacheTests.cs" />

diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln b/src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln
index d769b54..bdebba0 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {649A377C-1E07-4105-B01F-7F1044D3356C}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {649A377C-1E07-4105-B01F-7F1044D3356C}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {649A377C-1E07-4105-B01F-7F1044D3356C}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/Configurations.props b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/Configurations.props
index 31eca17..c1442f5 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/Configurations.props
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/Configurations.props
@@ -8,8 +8,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
index 64f2b64..fa6c7b6 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
@@ -11,7 +11,7 @@
     <IncludePath Condition="'$(TargetsNetCoreApp)' == 'true'">include\netcoreapp</IncludePath>
     <IncludePath Condition="'$(TargetsNetFx)' == 'true'">include\netfx</IncludePath>
     <IlasmFlags>$(IlasmFlags) -INCLUDE=$(IncludePath) -DEBUG=$(DebugOptimization)</IlasmFlags>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp2.0-Debug;netcoreapp2.0-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release;net45-Debug;net45-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp2.0-Debug;netcoreapp2.0-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release;net45-Debug;net45-Release;netfx-Debug;netfx-Release</Configurations>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props
index 61b88ac..671d43c 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj
index 58b67ce..e886646 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="UnsafeTests.cs" />

diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln b/src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln
index 2ebc5db..3dcb243 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {057BF9A0-199B-4EB5-85D5-84982259C7BC}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {057BF9A0-199B-4EB5-85D5-84982259C7BC}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {057BF9A0-199B-4EB5-85D5-84982259C7BC}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {057BF9A0-199B-4EB5-85D5-84982259C7BC}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {2122228D-ADAD-43D8-BC56-6A061DE8B25C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2122228D-ADAD-43D8-BC56-6A061DE8B25C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2122228D-ADAD-43D8-BC56-6A061DE8B25C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2122228D-ADAD-43D8-BC56-6A061DE8B25C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {057BF9A0-199B-4EB5-85D5-84982259C7BC}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {057BF9A0-199B-4EB5-85D5-84982259C7BC}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {057BF9A0-199B-4EB5-85D5-84982259C7BC}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {057BF9A0-199B-4EB5-85D5-84982259C7BC}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {2122228D-ADAD-43D8-BC56-6A061DE8B25C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2122228D-ADAD-43D8-BC56-6A061DE8B25C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2122228D-ADAD-43D8-BC56-6A061DE8B25C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2122228D-ADAD-43D8-BC56-6A061DE8B25C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/ref/Configurations.props b/src/libraries/System.Runtime.CompilerServices.VisualC/ref/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/ref/Configurations.props
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj b/src/libraries/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj
index 0fba717..4d0f626 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.CompilerServices.VisualC.cs" />

diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/src/Configurations.props b/src/libraries/System.Runtime.CompilerServices.VisualC/src/Configurations.props
index 55d2de1..7ac45c9 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/src/Configurations.props
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj b/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj
index 9028031..27f88ad 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Runtime.CompilerServices.VisualC</AssemblyName>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <!-- Shared CoreCLR -->
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/tests/Configurations.props b/src/libraries/System.Runtime.CompilerServices.VisualC/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/tests/Configurations.props
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/tests/System.Runtime.CompilerServices.VisualC.Tests.csproj b/src/libraries/System.Runtime.CompilerServices.VisualC/tests/System.Runtime.CompilerServices.VisualC.Tests.csproj
index ce3c54d..543a0ef 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/tests/System.Runtime.CompilerServices.VisualC.Tests.csproj
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/tests/System.Runtime.CompilerServices.VisualC.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Runtime\CompilerServices\RequiredAttributeAttributeTests.cs" />

diff --git a/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln b/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln
index 14e3e06..24edff1 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln
+++ b/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln
@@ -46,34 +46,34 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {E60AFAE8-2EA7-471C-9E24-52A99453B26B}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {E60AFAE8-2EA7-471C-9E24-52A99453B26B}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {E60AFAE8-2EA7-471C-9E24-52A99453B26B}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
                {E60AFAE8-2EA7-471C-9E24-52A99453B26B}.Release|Any CPU.Build.0 = netstandard2.0-Release|Any CPU
-               {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {C44B33E3-F89F-40B9-B353-D380C1524988}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C44B33E3-F89F-40B9-B353-D380C1524988}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C44B33E3-F89F-40B9-B353-D380C1524988}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C44B33E3-F89F-40B9-B353-D380C1524988}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {33B27785-02FD-4544-8E7D-EB802248BEC3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {33B27785-02FD-4544-8E7D-EB802248BEC3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {33B27785-02FD-4544-8E7D-EB802248BEC3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {33B27785-02FD-4544-8E7D-EB802248BEC3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {C44B33E3-F89F-40B9-B353-D380C1524988}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C44B33E3-F89F-40B9-B353-D380C1524988}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C44B33E3-F89F-40B9-B353-D380C1524988}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C44B33E3-F89F-40B9-B353-D380C1524988}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {33B27785-02FD-4544-8E7D-EB802248BEC3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {33B27785-02FD-4544-8E7D-EB802248BEC3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {33B27785-02FD-4544-8E7D-EB802248BEC3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {33B27785-02FD-4544-8E7D-EB802248BEC3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.Extensions/ref/Configurations.props b/src/libraries/System.Runtime.Extensions/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/ref/Configurations.props
+++ b/src/libraries/System.Runtime.Extensions/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj
index cb1e24c..387ecd1 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj
+++ b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.Extensions/src/Configurations.props b/src/libraries/System.Runtime.Extensions/src/Configurations.props
index ee16a95..d59c116 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/src/Configurations.props
+++ b/src/libraries/System.Runtime.Extensions/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
index 7f08047..64a5888 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
+++ b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
@@ -5,7 +5,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.Extensions/tests/Configurations.props b/src/libraries/System.Runtime.Extensions/tests/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Extensions/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
index 207da51..08e9d40 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
@@ -4,7 +4,7 @@
     <DefineConstants Condition="'$(TargetsUnix)' == 'true'">$(DefineConstants);Unix</DefineConstants>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\ApplicationIdTests.cs" />

diff --git a/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/Configurations.props b/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/Configurations.props
+++ b/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/TargetFrameworkNameTestApp.csproj b/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/TargetFrameworkNameTestApp.csproj
index 0fa0d03..2418014 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/TargetFrameworkNameTestApp.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/TargetFrameworkNameTestApp.csproj
@@ -4,7 +4,7 @@
     <!-- Setting a custom TargetFrameworkAttribute in AssemblyAttributes.cs -->
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <TestRuntime>true</TestRuntime>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />

diff --git a/src/libraries/System.Runtime.Extensions/tests/TestApp/Configurations.props b/src/libraries/System.Runtime.Extensions/tests/TestApp/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/tests/TestApp/Configurations.props
+++ b/src/libraries/System.Runtime.Extensions/tests/TestApp/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Extensions/tests/TestApp/TestApp.csproj b/src/libraries/System.Runtime.Extensions/tests/TestApp/TestApp.csproj
index bc1b983..a72e50b 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/tests/TestApp/TestApp.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/TestApp/TestApp.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <!-- To be consistent between netfx and others we override the SDK behavior which defaults to .dll -->
+    <!-- To be consistent between net472 and others we override the SDK behavior which defaults to .dll -->
     <TargetExt>.exe</TargetExt>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TestApp.cs" />

diff --git a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props
+++ b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj
index 4fe910d..d694272 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <!-- To be consistent between netfx and others we override the SDK behavior which defaults to .dll -->
+    <!-- To be consistent between net472 and others we override the SDK behavior which defaults to .dll -->
     <TargetExt>.exe</TargetExt>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />

diff --git a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props b/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props
+++ b/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj b/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
index e4b6cc8..ac79527 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <!-- To be consistent between netfx and others we override the SDK behavior which defaults to .dll -->
+    <!-- To be consistent between net472 and others we override the SDK behavior which defaults to .dll -->
     <TargetExt>.exe</TargetExt>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="VoidMainWithExitCodeApp.cs" />

diff --git a/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln b/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln
index 78b04ca..515f3da 100644 (file)
--- a/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln
+++ b/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {D85EE71C-F05B-4331-9300-8E2833D49E19}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D85EE71C-F05B-4331-9300-8E2833D49E19}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D85EE71C-F05B-4331-9300-8E2833D49E19}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D85EE71C-F05B-4331-9300-8E2833D49E19}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {46C4C03C-3055-4E97-858B-3E83CB862262}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {46C4C03C-3055-4E97-858B-3E83CB862262}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {46C4C03C-3055-4E97-858B-3E83CB862262}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {46C4C03C-3055-4E97-858B-3E83CB862262}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {D85EE71C-F05B-4331-9300-8E2833D49E19}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D85EE71C-F05B-4331-9300-8E2833D49E19}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D85EE71C-F05B-4331-9300-8E2833D49E19}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D85EE71C-F05B-4331-9300-8E2833D49E19}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {46C4C03C-3055-4E97-858B-3E83CB862262}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {46C4C03C-3055-4E97-858B-3E83CB862262}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {46C4C03C-3055-4E97-858B-3E83CB862262}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {46C4C03C-3055-4E97-858B-3E83CB862262}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.Handles/ref/Configurations.props b/src/libraries/System.Runtime.Handles/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Handles/ref/Configurations.props
+++ b/src/libraries/System.Runtime.Handles/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Handles/ref/System.Runtime.Handles.csproj b/src/libraries/System.Runtime.Handles/ref/System.Runtime.Handles.csproj
index 041effb..7e42404 100644 (file)
--- a/src/libraries/System.Runtime.Handles/ref/System.Runtime.Handles.csproj
+++ b/src/libraries/System.Runtime.Handles/ref/System.Runtime.Handles.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Handles.Forwards.cs" />

diff --git a/src/libraries/System.Runtime.Handles/src/Configurations.props b/src/libraries/System.Runtime.Handles/src/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Handles/src/Configurations.props
+++ b/src/libraries/System.Runtime.Handles/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj b/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj
index c715bdc..d71c490 100644 (file)
--- a/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj
+++ b/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Runtime.Handles</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Runtime" />

diff --git a/src/libraries/System.Runtime.Handles/tests/Configurations.props b/src/libraries/System.Runtime.Handles/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Handles/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Handles/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj b/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj
index b207833..8d209e8 100644 (file)
--- a/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj
+++ b/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln
index a5bfd8e..5f094a9 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/Configurations.props b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj
index 7b8bdf7..61183a9 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.InteropServices.RuntimeInformation.cs" />

diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props
index 1e8dd5d..30c654b 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
index c915eae..959e8cf 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -3,7 +3,7 @@
     <RootNamespace>System.Runtime.InteropServices</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Runtime\InteropServices\RuntimeInformation\RuntimeInformation.cs" />

diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
index 3748506..21a0333 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CheckArchitectureTests.cs" />

diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/System.Runtime.InteropServices.WindowsRuntime.sln b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/System.Runtime.InteropServices.WindowsRuntime.sln
index 0a5228e..efb2716 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/System.Runtime.InteropServices.WindowsRuntime.sln
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/System.Runtime.InteropServices.WindowsRuntime.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {27F624C8-06E3-455D-B5D1-C0FEB343EFAA}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {27F624C8-06E3-455D-B5D1-C0FEB343EFAA}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {27F624C8-06E3-455D-B5D1-C0FEB343EFAA}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {27F624C8-06E3-455D-B5D1-C0FEB343EFAA}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {5655C5E4-9B76-489B-87AF-42BD60570A00}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {5655C5E4-9B76-489B-87AF-42BD60570A00}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {5655C5E4-9B76-489B-87AF-42BD60570A00}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {5655C5E4-9B76-489B-87AF-42BD60570A00}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {DC485335-D0D7-4E28-9593-445B7B6BEFA7}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {DC485335-D0D7-4E28-9593-445B7B6BEFA7}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {DC485335-D0D7-4E28-9593-445B7B6BEFA7}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {DC485335-D0D7-4E28-9593-445B7B6BEFA7}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {27F624C8-06E3-455D-B5D1-C0FEB343EFAA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {27F624C8-06E3-455D-B5D1-C0FEB343EFAA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {27F624C8-06E3-455D-B5D1-C0FEB343EFAA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {27F624C8-06E3-455D-B5D1-C0FEB343EFAA}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5655C5E4-9B76-489B-87AF-42BD60570A00}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5655C5E4-9B76-489B-87AF-42BD60570A00}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {5655C5E4-9B76-489B-87AF-42BD60570A00}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {5655C5E4-9B76-489B-87AF-42BD60570A00}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {DC485335-D0D7-4E28-9593-445B7B6BEFA7}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {DC485335-D0D7-4E28-9593-445B7B6BEFA7}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {DC485335-D0D7-4E28-9593-445B7B6BEFA7}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {DC485335-D0D7-4E28-9593-445B7B6BEFA7}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/ref/Configurations.props b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/ref/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj
index b2ccfd9..459a8c7 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props
index ac4c08c..8129c93 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj
index 042b4b9..45c6b71 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Runtime.InteropServices.WindowsRuntime</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/tests/Configurations.props b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/tests/Configurations.props
index ac4c08c..8129c93 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/tests/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/tests/System.Runtime.InteropServices.WindowsRuntime.Tests.csproj b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/tests/System.Runtime.InteropServices.WindowsRuntime.Tests.csproj
index f34a4f1..6fb6b6f 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/tests/System.Runtime.InteropServices.WindowsRuntime.Tests.csproj
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/tests/System.Runtime.InteropServices.WindowsRuntime.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">

diff --git a/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln b/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
index 122c296..1d9b19e 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
+++ b/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {B17014F1-D902-417F-89B0-271204695831}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B17014F1-D902-417F-89B0-271204695831}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B17014F1-D902-417F-89B0-271204695831}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B17014F1-D902-417F-89B0-271204695831}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {B17014F1-D902-417F-89B0-271204695831}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B17014F1-D902-417F-89B0-271204695831}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B17014F1-D902-417F-89B0-271204695831}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B17014F1-D902-417F-89B0-271204695831}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.InteropServices/ref/Configurations.props b/src/libraries/System.Runtime.InteropServices/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices/ref/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj b/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
index 1d4dc62..c5708af 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
+++ b/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
@@ -4,7 +4,7 @@
          to its own obsolete API. -->
     <NoWarn>$(NoWarn);618</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.InteropServices/src/Configurations.props b/src/libraries/System.Runtime.InteropServices/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices/src/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
index 0285a6c..9915574 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
+++ b/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
@@ -5,7 +5,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CoreLibSharedDir)System\HResults.cs">

diff --git a/src/libraries/System.Runtime.InteropServices/tests/Configurations.props b/src/libraries/System.Runtime.InteropServices/tests/Configurations.props
index c237ccf..85e1a43 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices/tests/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices/tests/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent);
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj
index 6b3fccd..deb6bfd 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj
+++ b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.Intrinsics.Experimental/System.Runtime.Intrinsics.Experimental.sln b/src/libraries/System.Runtime.Intrinsics.Experimental/System.Runtime.Intrinsics.Experimental.sln
index 9123ecd..affac9a 100644 (file)
--- a/src/libraries/System.Runtime.Intrinsics.Experimental/System.Runtime.Intrinsics.Experimental.sln
+++ b/src/libraries/System.Runtime.Intrinsics.Experimental/System.Runtime.Intrinsics.Experimental.sln
@@ -19,14 +19,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {543FBFE5-E9E4-4631-8242-911A707FE818}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {543FBFE5-E9E4-4631-8242-911A707FE818}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {543FBFE5-E9E4-4631-8242-911A707FE818}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {543FBFE5-E9E4-4631-8242-911A707FE818}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {4074AF8C-8C65-486C-960E-F45DAAB0BE0D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4074AF8C-8C65-486C-960E-F45DAAB0BE0D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4074AF8C-8C65-486C-960E-F45DAAB0BE0D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4074AF8C-8C65-486C-960E-F45DAAB0BE0D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {543FBFE5-E9E4-4631-8242-911A707FE818}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {543FBFE5-E9E4-4631-8242-911A707FE818}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {543FBFE5-E9E4-4631-8242-911A707FE818}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {543FBFE5-E9E4-4631-8242-911A707FE818}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4074AF8C-8C65-486C-960E-F45DAAB0BE0D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4074AF8C-8C65-486C-960E-F45DAAB0BE0D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4074AF8C-8C65-486C-960E-F45DAAB0BE0D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4074AF8C-8C65-486C-960E-F45DAAB0BE0D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.Intrinsics.Experimental/ref/Configurations.props b/src/libraries/System.Runtime.Intrinsics.Experimental/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Intrinsics.Experimental/ref/Configurations.props
+++ b/src/libraries/System.Runtime.Intrinsics.Experimental/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.Experimental.csproj b/src/libraries/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.Experimental.csproj
index c22d54f..88c67fd 100644 (file)
--- a/src/libraries/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.Experimental.csproj
+++ b/src/libraries/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.Experimental.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Intrinsics.Experimental.cs" />

diff --git a/src/libraries/System.Runtime.Intrinsics.Experimental/src/Configurations.props b/src/libraries/System.Runtime.Intrinsics.Experimental/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Runtime.Intrinsics.Experimental/src/Configurations.props
+++ b/src/libraries/System.Runtime.Intrinsics.Experimental/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.Intrinsics.Experimental/src/System.Runtime.Intrinsics.Experimental.csproj b/src/libraries/System.Runtime.Intrinsics.Experimental/src/System.Runtime.Intrinsics.Experimental.csproj
index 2b3cf47..a4e6fb0 100644 (file)
--- a/src/libraries/System.Runtime.Intrinsics.Experimental/src/System.Runtime.Intrinsics.Experimental.csproj
+++ b/src/libraries/System.Runtime.Intrinsics.Experimental/src/System.Runtime.Intrinsics.Experimental.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Runtime.Intrinsics.Experimental</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln b/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
index 91551b7..36edc80 100644 (file)
--- a/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
+++ b/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
@@ -19,14 +19,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {315E3C60-A5D9-4F47-A940-D57395EED606}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {315E3C60-A5D9-4F47-A940-D57395EED606}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {315E3C60-A5D9-4F47-A940-D57395EED606}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {315E3C60-A5D9-4F47-A940-D57395EED606}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F9097917-AFA3-4E3E-A592-BFA2C483C7E2}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F9097917-AFA3-4E3E-A592-BFA2C483C7E2}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F9097917-AFA3-4E3E-A592-BFA2C483C7E2}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F9097917-AFA3-4E3E-A592-BFA2C483C7E2}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {315E3C60-A5D9-4F47-A940-D57395EED606}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {315E3C60-A5D9-4F47-A940-D57395EED606}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {315E3C60-A5D9-4F47-A940-D57395EED606}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {315E3C60-A5D9-4F47-A940-D57395EED606}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F9097917-AFA3-4E3E-A592-BFA2C483C7E2}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F9097917-AFA3-4E3E-A592-BFA2C483C7E2}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F9097917-AFA3-4E3E-A592-BFA2C483C7E2}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F9097917-AFA3-4E3E-A592-BFA2C483C7E2}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.Intrinsics/ref/Configurations.props b/src/libraries/System.Runtime.Intrinsics/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Intrinsics/ref/Configurations.props
+++ b/src/libraries/System.Runtime.Intrinsics/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj b/src/libraries/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj
index 2b7d3f1..1d488d4 100644 (file)
--- a/src/libraries/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj
+++ b/src/libraries/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.Intrinsics/src/Configurations.props b/src/libraries/System.Runtime.Intrinsics/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Runtime.Intrinsics/src/Configurations.props
+++ b/src/libraries/System.Runtime.Intrinsics/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj b/src/libraries/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj
index 799f70e..c9c65cd 100644 (file)
--- a/src/libraries/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj
+++ b/src/libraries/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln b/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln
index 19034a6..34fd0b1 100644 (file)
--- a/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln
+++ b/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln
@@ -71,54 +71,54 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {95DBE3B0-AA86-4366-BB8A-E04B534365F3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {95DBE3B0-AA86-4366-BB8A-E04B534365F3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {95DBE3B0-AA86-4366-BB8A-E04B534365F3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {95DBE3B0-AA86-4366-BB8A-E04B534365F3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {2CD5A44C-65B4-4C51-AC7B-B2938307848A}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2CD5A44C-65B4-4C51-AC7B-B2938307848A}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2CD5A44C-65B4-4C51-AC7B-B2938307848A}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2CD5A44C-65B4-4C51-AC7B-B2938307848A}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {7FA764E6-47A3-42B5-923B-7D5DBC611E8E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7FA764E6-47A3-42B5-923B-7D5DBC611E8E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7FA764E6-47A3-42B5-923B-7D5DBC611E8E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7FA764E6-47A3-42B5-923B-7D5DBC611E8E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {F430F54A-7F28-4707-8006-F628B576664E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F430F54A-7F28-4707-8006-F628B576664E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F430F54A-7F28-4707-8006-F628B576664E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F430F54A-7F28-4707-8006-F628B576664E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {FB507A82-ACDD-4809-A030-6F9372A71194}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {FB507A82-ACDD-4809-A030-6F9372A71194}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {FB507A82-ACDD-4809-A030-6F9372A71194}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {FB507A82-ACDD-4809-A030-6F9372A71194}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {95DBE3B0-AA86-4366-BB8A-E04B534365F3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {95DBE3B0-AA86-4366-BB8A-E04B534365F3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {95DBE3B0-AA86-4366-BB8A-E04B534365F3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {95DBE3B0-AA86-4366-BB8A-E04B534365F3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {2CD5A44C-65B4-4C51-AC7B-B2938307848A}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2CD5A44C-65B4-4C51-AC7B-B2938307848A}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2CD5A44C-65B4-4C51-AC7B-B2938307848A}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2CD5A44C-65B4-4C51-AC7B-B2938307848A}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {7FA764E6-47A3-42B5-923B-7D5DBC611E8E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7FA764E6-47A3-42B5-923B-7D5DBC611E8E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7FA764E6-47A3-42B5-923B-7D5DBC611E8E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7FA764E6-47A3-42B5-923B-7D5DBC611E8E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {F430F54A-7F28-4707-8006-F628B576664E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F430F54A-7F28-4707-8006-F628B576664E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F430F54A-7F28-4707-8006-F628B576664E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F430F54A-7F28-4707-8006-F628B576664E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {FB507A82-ACDD-4809-A030-6F9372A71194}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {FB507A82-ACDD-4809-A030-6F9372A71194}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {FB507A82-ACDD-4809-A030-6F9372A71194}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {FB507A82-ACDD-4809-A030-6F9372A71194}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.Loader/ref/Configurations.props b/src/libraries/System.Runtime.Loader/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Loader/ref/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.csproj b/src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.csproj
index fc45953..f12463e 100644 (file)
--- a/src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.csproj
+++ b/src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <!-- CS0067: unused event, reference assembly does not care -->
     <NoWarn>$(NoWarn);0067</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.Loader/src/Configurations.props b/src/libraries/System.Runtime.Loader/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Runtime.Loader/src/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj b/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj
index 7af7d86..8d775f5 100644 (file)
--- a/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj
+++ b/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Runtime.Loader</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Runtime.Loader/tests/Configurations.props b/src/libraries/System.Runtime.Loader/tests/Configurations.props
index ee16a95..d59c116 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.Loader/tests/ContextualReflectionDependency/Configurations.props b/src/libraries/System.Runtime.Loader/tests/ContextualReflectionDependency/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/ContextualReflectionDependency/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/tests/ContextualReflectionDependency/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.Loader/tests/ContextualReflectionDependency/System.Runtime.Loader.Test.ContextualReflectionDependency.csproj b/src/libraries/System.Runtime.Loader/tests/ContextualReflectionDependency/System.Runtime.Loader.Test.ContextualReflectionDependency.csproj
index 56bf0dc..63a3ee7 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/ContextualReflectionDependency/System.Runtime.Loader.Test.ContextualReflectionDependency.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ContextualReflectionDependency/System.Runtime.Loader.Test.ContextualReflectionDependency.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ContextualReflectionDependency.cs" />

diff --git a/src/libraries/System.Runtime.Loader/tests/DefaultContext/Configurations.props b/src/libraries/System.Runtime.Loader/tests/DefaultContext/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/DefaultContext/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/tests/DefaultContext/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj b/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj
index aa70e21..eb7d166 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
     <!-- LoadInDefaultContext test relies on no deps.json -->
     <GenerateDependencyFile>false</GenerateDependencyFile>

diff --git a/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/Configurations.props b/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj b/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj
index d9e27a3..7073c50 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.Loader/tests/ReferencedClassLib/Configurations.props b/src/libraries/System.Runtime.Loader/tests/ReferencedClassLib/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/ReferencedClassLib/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/tests/ReferencedClassLib/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.Loader/tests/ReferencedClassLib/ReferencedClassLib.csproj b/src/libraries/System.Runtime.Loader/tests/ReferencedClassLib/ReferencedClassLib.csproj
index 9dcfede..20327fb 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/ReferencedClassLib/ReferencedClassLib.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ReferencedClassLib/ReferencedClassLib.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ReferencedClassLib.cs" />

diff --git a/src/libraries/System.Runtime.Loader/tests/ReferencedClassLibNeutralIsSatellite/Configurations.props b/src/libraries/System.Runtime.Loader/tests/ReferencedClassLibNeutralIsSatellite/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/ReferencedClassLibNeutralIsSatellite/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/tests/ReferencedClassLibNeutralIsSatellite/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.Loader/tests/ReferencedClassLibNeutralIsSatellite/ReferencedClassLibNeutralIsSatellite.csproj b/src/libraries/System.Runtime.Loader/tests/ReferencedClassLibNeutralIsSatellite/ReferencedClassLibNeutralIsSatellite.csproj
index 29b7e3a..489ac53 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/ReferencedClassLibNeutralIsSatellite/ReferencedClassLibNeutralIsSatellite.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ReferencedClassLibNeutralIsSatellite/ReferencedClassLibNeutralIsSatellite.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ReferencedClassLibNeutralIsSatellite.cs" />

diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/Configurations.props b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj
index 99a4863..9611218 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Test expects an un-signed assembly -->
     <SignAssembly>false</SignAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TestClass.cs" />

diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/Configurations.props b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/Configurations.props
index 2e546b4..d6b33dd 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj
index ec37b19..051d4d0 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TestClass.cs" />

diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly2/Configurations.props b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly2/Configurations.props
index 253ad5b..086d1b1 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly2/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly2/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly2/System.Runtime.Loader.Test.Assembly2.csproj b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly2/System.Runtime.Loader.Test.Assembly2.csproj
index b9d2a95..09cc2d9 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly2/System.Runtime.Loader.Test.Assembly2.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly2/System.Runtime.Loader.Test.Assembly2.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\System.Runtime.Loader.Test.Assembly\TestClass.cs" />

diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.AssemblyNotSupported/Configurations.props b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.AssemblyNotSupported/Configurations.props
index 253ad5b..086d1b1 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.AssemblyNotSupported/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.AssemblyNotSupported/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.AssemblyNotSupported/System.Runtime.Loader.Test.AssemblyNotSupported.csproj b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.AssemblyNotSupported/System.Runtime.Loader.Test.AssemblyNotSupported.csproj
index f5e8d2e..cbde4d8 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.AssemblyNotSupported/System.Runtime.Loader.Test.AssemblyNotSupported.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.AssemblyNotSupported/System.Runtime.Loader.Test.AssemblyNotSupported.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TestClassNotSupported.cs" />

diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj
index 60bc7b6..b26150f 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <!-- Some tests rely on no deps.json file being present. -->

diff --git a/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln b/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln
index 6aa634c..9128144 100644 (file)
--- a/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln
+++ b/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.Numerics/ref/Configurations.props b/src/libraries/System.Runtime.Numerics/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Numerics/ref/Configurations.props
+++ b/src/libraries/System.Runtime.Numerics/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj b/src/libraries/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj
index 623e8db..27b0f4d 100644 (file)
--- a/src/libraries/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj
+++ b/src/libraries/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Numerics.cs" />

diff --git a/src/libraries/System.Runtime.Numerics/src/Configurations.props b/src/libraries/System.Runtime.Numerics/src/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Numerics/src/Configurations.props
+++ b/src/libraries/System.Runtime.Numerics/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj b/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj
index 354dafe..2183479 100644 (file)
--- a/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj
+++ b/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>System.Runtime.Numerics</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Numerics\BigIntegerCalculator.AddSub.cs" />

diff --git a/src/libraries/System.Runtime.Numerics/tests/Configurations.props b/src/libraries/System.Runtime.Numerics/tests/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Runtime.Numerics/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Numerics/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj b/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj
index 0010931..bdc7136 100644 (file)
--- a/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj
+++ b/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BigInteger\absolutevalue.cs" />

diff --git a/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln b/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln
index 88724a8..7b4233c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln
+++ b/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {13CE5E71-D373-4EA6-B3CB-166FF089A42A}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {13CE5E71-D373-4EA6-B3CB-166FF089A42A}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {13CE5E71-D373-4EA6-B3CB-166FF089A42A}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {13CE5E71-D373-4EA6-B3CB-166FF089A42A}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {CF80D24A-787A-43DB-B9E7-10BCA02D10EA}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {CF80D24A-787A-43DB-B9E7-10BCA02D10EA}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {CF80D24A-787A-43DB-B9E7-10BCA02D10EA}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {CF80D24A-787A-43DB-B9E7-10BCA02D10EA}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {4413B319-3D48-4516-A45B-375F4650EF0D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4413B319-3D48-4516-A45B-375F4650EF0D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4413B319-3D48-4516-A45B-375F4650EF0D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4413B319-3D48-4516-A45B-375F4650EF0D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {13CE5E71-D373-4EA6-B3CB-166FF089A42A}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {13CE5E71-D373-4EA6-B3CB-166FF089A42A}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {13CE5E71-D373-4EA6-B3CB-166FF089A42A}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {13CE5E71-D373-4EA6-B3CB-166FF089A42A}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {CF80D24A-787A-43DB-B9E7-10BCA02D10EA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {CF80D24A-787A-43DB-B9E7-10BCA02D10EA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {CF80D24A-787A-43DB-B9E7-10BCA02D10EA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {CF80D24A-787A-43DB-B9E7-10BCA02D10EA}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4413B319-3D48-4516-A45B-375F4650EF0D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4413B319-3D48-4516-A45B-375F4650EF0D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4413B319-3D48-4516-A45B-375F4650EF0D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4413B319-3D48-4516-A45B-375F4650EF0D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.Serialization.Formatters/ref/Configurations.props b/src/libraries/System.Runtime.Serialization.Formatters/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Formatters/ref/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Formatters/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj b/src/libraries/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj
index f0f7e05..f3ac44c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj
+++ b/src/libraries/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.Serialization.Formatters/src/Configurations.props b/src/libraries/System.Runtime.Serialization.Formatters/src/Configurations.props
index bb2aad0..d64b36f 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Formatters/src/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Formatters/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
       $(PackageConfigurations);
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
index 48d7b39..2c93261 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
+++ b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Runtime.Serialization.Formatters</AssemblyName>
     <RootNamespace>System.Runtime.Serialization.Formatters</RootNamespace>
     <NoWarn>$(NoWarn);CS1573</NoWarn>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/Configurations.props b/src/libraries/System.Runtime.Serialization.Formatters/tests/Configurations.props
index b96b67a..3a6000a 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Formatters/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
-    <!-- Needs netfx configuration per bug (dotnet/corefx #17575) so tests are actively running in desktop -->
+    <!-- Needs $(NetFrameworkCurrent) configuration per bug (dotnet/corefx #17575) so tests are actively running in desktop -->
     <BuildConfigurations>
-      netfx;
-      netcoreapp;
+      $(NetFrameworkCurrent);
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
index 67a2e6b..5a0cb0d 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
@@ -3,7 +3,7 @@
     <SkipIncludeNewtonsoftJson>true</SkipIncludeNewtonsoftJson>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BinaryFormatterTestData.cs" />

diff --git a/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln b/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln
index 582fea2..8f0d900 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln
+++ b/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln
@@ -31,22 +31,22 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {173F6978-B961-4D1C-84E4-06468772D019}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {173F6978-B961-4D1C-84E4-06468772D019}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {173F6978-B961-4D1C-84E4-06468772D019}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {173F6978-B961-4D1C-84E4-06468772D019}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {5119E88F-FA73-4FC6-A327-DD7C77E746BC}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {5119E88F-FA73-4FC6-A327-DD7C77E746BC}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {5119E88F-FA73-4FC6-A327-DD7C77E746BC}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {5119E88F-FA73-4FC6-A327-DD7C77E746BC}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {173F6978-B961-4D1C-84E4-06468772D019}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {173F6978-B961-4D1C-84E4-06468772D019}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {173F6978-B961-4D1C-84E4-06468772D019}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {173F6978-B961-4D1C-84E4-06468772D019}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {5119E88F-FA73-4FC6-A327-DD7C77E746BC}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {5119E88F-FA73-4FC6-A327-DD7C77E746BC}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {5119E88F-FA73-4FC6-A327-DD7C77E746BC}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {5119E88F-FA73-4FC6-A327-DD7C77E746BC}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.Serialization.Json/ref/Configurations.props b/src/libraries/System.Runtime.Serialization.Json/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Json/ref/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Json/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj b/src/libraries/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj
index 4c77be9..b4dbff8 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj
+++ b/src/libraries/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Serialization.Json.cs" />

diff --git a/src/libraries/System.Runtime.Serialization.Json/src/Configurations.props b/src/libraries/System.Runtime.Serialization.Json/src/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Json/src/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Json/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj b/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj
index dab61e9..7a44038 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj
+++ b/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Runtime.Serialization.Json</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(LibrariesProjectRoot)System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj" />

diff --git a/src/libraries/System.Runtime.Serialization.Json/tests/Configurations.props b/src/libraries/System.Runtime.Serialization.Json/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Json/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Json/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Json/tests/ReflectionOnly/Configurations.props b/src/libraries/System.Runtime.Serialization.Json/tests/ReflectionOnly/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Json/tests/ReflectionOnly/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Json/tests/ReflectionOnly/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj b/src/libraries/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj
index 26d8bde..e3532a7 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);ReflectionOnly</DefineConstants>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Utils.cs" />

diff --git a/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj b/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj
index 899c0f4..c9636a1 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(TestSourceFolder)DataContractJsonSerializer.cs" />

diff --git a/src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln b/src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln
index 7576574..bcb66a7 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln
+++ b/src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {43341081-27A8-4CFB-8B89-C63CE457EAC2}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {43341081-27A8-4CFB-8B89-C63CE457EAC2}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {43341081-27A8-4CFB-8B89-C63CE457EAC2}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {43341081-27A8-4CFB-8B89-C63CE457EAC2}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {7E73C175-98C7-471B-B1A4-998C20F58854}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7E73C175-98C7-471B-B1A4-998C20F58854}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7E73C175-98C7-471B-B1A4-998C20F58854}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7E73C175-98C7-471B-B1A4-998C20F58854}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {43341081-27A8-4CFB-8B89-C63CE457EAC2}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {43341081-27A8-4CFB-8B89-C63CE457EAC2}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {43341081-27A8-4CFB-8B89-C63CE457EAC2}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {43341081-27A8-4CFB-8B89-C63CE457EAC2}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {7E73C175-98C7-471B-B1A4-998C20F58854}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7E73C175-98C7-471B-B1A4-998C20F58854}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7E73C175-98C7-471B-B1A4-998C20F58854}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7E73C175-98C7-471B-B1A4-998C20F58854}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.Serialization.Primitives/ref/Configurations.props b/src/libraries/System.Runtime.Serialization.Primitives/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Primitives/ref/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Primitives/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj b/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj
index b3c86b8..966b061 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj
+++ b/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Serialization.Primitives.cs" />

diff --git a/src/libraries/System.Runtime.Serialization.Primitives/src/Configurations.props b/src/libraries/System.Runtime.Serialization.Primitives/src/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Primitives/src/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Primitives/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
index 4c34aa1..9c14f37 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
+++ b/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
@@ -7,7 +7,7 @@
     <FileAlignment>512</FileAlignment>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Runtime\Serialization\CollectionDataContractAttribute.cs" />

diff --git a/src/libraries/System.Runtime.Serialization.Primitives/tests/Configurations.props b/src/libraries/System.Runtime.Serialization.Primitives/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Primitives/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Primitives/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Primitives/tests/System.Runtime.Serialization.Primitives.Tests.csproj b/src/libraries/System.Runtime.Serialization.Primitives/tests/System.Runtime.Serialization.Primitives.Tests.csproj
index c3dd6d4..1585c56 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Primitives/tests/System.Runtime.Serialization.Primitives.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Primitives/tests/System.Runtime.Serialization.Primitives.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Runtime\Serialization\CollectionDataContractAttributeTests.cs" />

diff --git a/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln b/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln
index 011eeb8..cb9288c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln
+++ b/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln
@@ -36,26 +36,26 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {30CAB353-089E-4294-B23B-F2DD1D945654}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {30CAB353-089E-4294-B23B-F2DD1D945654}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {30CAB353-089E-4294-B23B-F2DD1D945654}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {30CAB353-089E-4294-B23B-F2DD1D945654}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {D3AD82FC-051D-4121-8E48-B13CE8024776}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D3AD82FC-051D-4121-8E48-B13CE8024776}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D3AD82FC-051D-4121-8E48-B13CE8024776}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D3AD82FC-051D-4121-8E48-B13CE8024776}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {38889701-0af4-48b3-999c-e99d639c61b6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {38889701-0af4-48b3-999c-e99d639c61b6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {38889701-0af4-48b3-999c-e99d639c61b6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {38889701-0af4-48b3-999c-e99d639c61b6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {025743B4-6E1E-4602-BE7F-1E479CC8EEBE}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {025743B4-6E1E-4602-BE7F-1E479CC8EEBE}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {025743B4-6E1E-4602-BE7F-1E479CC8EEBE}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {025743B4-6E1E-4602-BE7F-1E479CC8EEBE}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {30CAB353-089E-4294-B23B-F2DD1D945654}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {30CAB353-089E-4294-B23B-F2DD1D945654}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {30CAB353-089E-4294-B23B-F2DD1D945654}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {30CAB353-089E-4294-B23B-F2DD1D945654}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {D3AD82FC-051D-4121-8E48-B13CE8024776}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D3AD82FC-051D-4121-8E48-B13CE8024776}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D3AD82FC-051D-4121-8E48-B13CE8024776}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D3AD82FC-051D-4121-8E48-B13CE8024776}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {38889701-0af4-48b3-999c-e99d639c61b6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {38889701-0af4-48b3-999c-e99d639c61b6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {38889701-0af4-48b3-999c-e99d639c61b6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {38889701-0af4-48b3-999c-e99d639c61b6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {025743B4-6E1E-4602-BE7F-1E479CC8EEBE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {025743B4-6E1E-4602-BE7F-1E479CC8EEBE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {025743B4-6E1E-4602-BE7F-1E479CC8EEBE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {025743B4-6E1E-4602-BE7F-1E479CC8EEBE}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.Serialization.Xml/ref/Configurations.props b/src/libraries/System.Runtime.Serialization.Xml/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/ref/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Xml/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj b/src/libraries/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj
index fec7a24..7d2717b 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Serialization.Xml.cs" />

diff --git a/src/libraries/System.Runtime.Serialization.Xml/src/Configurations.props b/src/libraries/System.Runtime.Serialization.Xml/src/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/src/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Xml/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj b/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj
index a62ca08..5b4cdd4 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Runtime.Serialization.Xml</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj" />

diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/Configurations.props b/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/Configurations.props
index 3b96bea..59e260d 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;                      
+      $(NetCoreAppCurrent)                     
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj
index 8542419..bb137f1 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(TestSourceFolder)CanonicalizationTestHelper.cs" />

diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/Configurations.props b/src/libraries/System.Runtime.Serialization.Xml/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/Configurations.props b/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj
index c458f79..16c4ec2 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);ReflectionOnly</DefineConstants>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Utils.cs" />

diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj
index 6616e8f..c6b119b 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(TestSourceFolder)DataContractSerializerStressTests.cs" />

diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/System.Runtime.WindowsRuntime.UI.Xaml.sln b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/System.Runtime.WindowsRuntime.UI.Xaml.sln
index e4df353..286a36a 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/System.Runtime.WindowsRuntime.UI.Xaml.sln
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/System.Runtime.WindowsRuntime.UI.Xaml.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {263DA4F1-C3BC-4B43-98E7-9F38B419A131}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {263DA4F1-C3BC-4B43-98E7-9F38B419A131}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {263DA4F1-C3BC-4B43-98E7-9F38B419A131}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {263DA4F1-C3BC-4B43-98E7-9F38B419A131}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {AA1600B8-C4D3-42A9-A28A-04D0C8282566}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {AA1600B8-C4D3-42A9-A28A-04D0C8282566}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {AA1600B8-C4D3-42A9-A28A-04D0C8282566}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {AA1600B8-C4D3-42A9-A28A-04D0C8282566}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {263DA4F1-C3BC-4B43-98E7-9F38B419A131}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {263DA4F1-C3BC-4B43-98E7-9F38B419A131}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {263DA4F1-C3BC-4B43-98E7-9F38B419A131}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {263DA4F1-C3BC-4B43-98E7-9F38B419A131}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {AA1600B8-C4D3-42A9-A28A-04D0C8282566}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {AA1600B8-C4D3-42A9-A28A-04D0C8282566}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {AA1600B8-C4D3-42A9-A28A-04D0C8282566}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {AA1600B8-C4D3-42A9-A28A-04D0C8282566}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/Configurations.props b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/Configurations.props
index 9eacde4..b48545a 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/Configurations.props
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/Configurations.props
@@ -5,7 +5,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj
index 5f1d1d0..333fb25 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.WindowsRuntime.UI.Xaml.cs" />

diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/Configurations.props b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/Configurations.props
index 9ae22a7..3c4066b 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/Configurations.props
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj
index 8d35493..d8d0b9b 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj
@@ -5,7 +5,7 @@
     <AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard1.1'">4.0.1.0</AssemblyVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="System\Runtime\InteropServices\HResults.cs" />

diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/tests/Configurations.props b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/tests/Configurations.props
index d3663b5..cb2021a 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/tests/Configurations.props
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/tests/System.Runtime.WindowsRuntime.UI.Xaml.Tests.csproj b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/tests/System.Runtime.WindowsRuntime.UI.Xaml.Tests.csproj
index e1085da..367eef9 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/tests/System.Runtime.WindowsRuntime.UI.Xaml.Tests.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/tests/System.Runtime.WindowsRuntime.UI.Xaml.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Windows\UI\Xaml\CornerRadiusTests.cs" />

diff --git a/src/libraries/System.Runtime.WindowsRuntime/System.Runtime.WindowsRuntime.sln b/src/libraries/System.Runtime.WindowsRuntime/System.Runtime.WindowsRuntime.sln
index bfaa6e6..3de0e7b 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime/System.Runtime.WindowsRuntime.sln
+++ b/src/libraries/System.Runtime.WindowsRuntime/System.Runtime.WindowsRuntime.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {844A2A0B-4169-49C3-B367-AFDC4894E487}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {844A2A0B-4169-49C3-B367-AFDC4894E487}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {844A2A0B-4169-49C3-B367-AFDC4894E487}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {844A2A0B-4169-49C3-B367-AFDC4894E487}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {FDDA3E4A-B182-4CD1-B624-EBD72D8A05DA}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {FDDA3E4A-B182-4CD1-B624-EBD72D8A05DA}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {FDDA3E4A-B182-4CD1-B624-EBD72D8A05DA}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {FDDA3E4A-B182-4CD1-B624-EBD72D8A05DA}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {844A2A0B-4169-49C3-B367-AFDC4894E487}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {844A2A0B-4169-49C3-B367-AFDC4894E487}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {844A2A0B-4169-49C3-B367-AFDC4894E487}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {844A2A0B-4169-49C3-B367-AFDC4894E487}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {FDDA3E4A-B182-4CD1-B624-EBD72D8A05DA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {FDDA3E4A-B182-4CD1-B624-EBD72D8A05DA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {FDDA3E4A-B182-4CD1-B624-EBD72D8A05DA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {FDDA3E4A-B182-4CD1-B624-EBD72D8A05DA}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime.WindowsRuntime/ref/Configurations.props b/src/libraries/System.Runtime.WindowsRuntime/ref/Configurations.props
index 9eacde4..b48545a 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime/ref/Configurations.props
+++ b/src/libraries/System.Runtime.WindowsRuntime/ref/Configurations.props
@@ -5,7 +5,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
index a9a45f4..5d98caa 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
@@ -10,7 +10,7 @@
                        match the output assembly name 'System.Runtime.WindowsRuntime, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b77a5c561934e089'.
      -->
     <NoWarn>$(NoWarn);1698</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.WindowsRuntime.cs" />

diff --git a/src/libraries/System.Runtime.WindowsRuntime/src/Configurations.props b/src/libraries/System.Runtime.WindowsRuntime/src/Configurations.props
index 9a5946e..bfba2f7 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime/src/Configurations.props
+++ b/src/libraries/System.Runtime.WindowsRuntime/src/Configurations.props
@@ -8,7 +8,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
index abff361..b185d7a 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
@@ -9,7 +9,7 @@
     <AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard1.0'">4.0.0.0</AssemblyVersion>
     <AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard1.2'">4.0.11.0</AssemblyVersion>
     <DefineConstants Condition="'$(TargetsNetCoreApp)' == 'true'">$(DefineConstants);FEATURE_APPX</DefineConstants>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release;netstandard1.2-Debug;netstandard1.2-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release;netstandard1.2-Debug;netstandard1.2-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetsNetStandard)' == 'true'">
     <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_WindowsRuntime</GeneratePlatformNotSupportedAssemblyMessage>
@@ -32,7 +32,7 @@
     <ReferenceFromRuntime Include="System.Runtime.InteropServices.WindowsRuntime" />
     <ReferenceFromRuntime Include="System.ObjectModel" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <!-- Needed for the compiler to resolve IObservableMap.MapChanged. -->
     <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj">

diff --git a/src/libraries/System.Runtime.WindowsRuntime/tests/Configurations.props b/src/libraries/System.Runtime.WindowsRuntime/tests/Configurations.props
index d3663b5..cb2021a 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime/tests/Configurations.props
+++ b/src/libraries/System.Runtime.WindowsRuntime/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime.WindowsRuntime/tests/System.Runtime.WindowsRuntime.Tests.csproj b/src/libraries/System.Runtime.WindowsRuntime/tests/System.Runtime.WindowsRuntime.Tests.csproj
index 9cd12c0..a9dd08b 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime/tests/System.Runtime.WindowsRuntime.Tests.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/tests/System.Runtime.WindowsRuntime.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime/System.Runtime.sln b/src/libraries/System.Runtime/System.Runtime.sln
index 74bee35..a23dc83 100644 (file)
--- a/src/libraries/System.Runtime/System.Runtime.sln
+++ b/src/libraries/System.Runtime/System.Runtime.sln
@@ -46,10 +46,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {F9C30DC5-30C1-45DA-9336-F7BE358C367C}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {F9C30DC5-30C1-45DA-9336-F7BE358C367C}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {F9C30DC5-30C1-45DA-9336-F7BE358C367C}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
@@ -66,14 +66,14 @@ Global
                {6B002B34-089C-4BC4-91DD-57D350DEA91C}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {6B002B34-089C-4BC4-91DD-57D350DEA91C}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
                {6B002B34-089C-4BC4-91DD-57D350DEA91C}.Release|Any CPU.Build.0 = netstandard2.0-Release|Any CPU
-               {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {ADBCF120-3454-4A3C-9D1D-AC4293E795D6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {ADBCF120-3454-4A3C-9D1D-AC4293E795D6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {ADBCF120-3454-4A3C-9D1D-AC4293E795D6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {ADBCF120-3454-4A3C-9D1D-AC4293E795D6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {ADBCF120-3454-4A3C-9D1D-AC4293E795D6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {ADBCF120-3454-4A3C-9D1D-AC4293E795D6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {ADBCF120-3454-4A3C-9D1D-AC4293E795D6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {ADBCF120-3454-4A3C-9D1D-AC4293E795D6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Runtime/ref/Configurations.props b/src/libraries/System.Runtime/ref/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/System.Runtime/ref/Configurations.props
+++ b/src/libraries/System.Runtime/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime/ref/System.Runtime.csproj b/src/libraries/System.Runtime/ref/System.Runtime.csproj
index db03e23..a569c0d 100644 (file)
--- a/src/libraries/System.Runtime/ref/System.Runtime.csproj
+++ b/src/libraries/System.Runtime/ref/System.Runtime.csproj
@@ -5,7 +5,7 @@
     <RuntimeMetadataVersion>v4.0.30319</RuntimeMetadataVersion>
     <!-- disable warnings about obsolete APIs -->
     <NoWarn>$(NoWarn);0809;0618</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime/src/Configurations.props b/src/libraries/System.Runtime/src/Configurations.props
index db38925..f392247 100644 (file)
--- a/src/libraries/System.Runtime/src/Configurations.props
+++ b/src/libraries/System.Runtime/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Runtime/src/System.Runtime.csproj b/src/libraries/System.Runtime/src/System.Runtime.csproj
index f336662..62060e3 100644 (file)
--- a/src/libraries/System.Runtime/src/System.Runtime.csproj
+++ b/src/libraries/System.Runtime/src/System.Runtime.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Runtime</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime/tests/Configurations.props b/src/libraries/System.Runtime/tests/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Runtime/tests/Configurations.props
+++ b/src/libraries/System.Runtime/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
index 50a4ef7..0996f12 100644 (file)
--- a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
+++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
@@ -4,7 +4,7 @@
     <NoWarn>1718</NoWarn>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\EnumTypes.cs">

diff --git a/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln b/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln
index fa76fec..121bf79 100644 (file)
--- a/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln
+++ b/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {70FAC855-CAC6-4523-8477-880548D58A1B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {70FAC855-CAC6-4523-8477-880548D58A1B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {70FAC855-CAC6-4523-8477-880548D58A1B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {70FAC855-CAC6-4523-8477-880548D58A1B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {70FAC855-CAC6-4523-8477-880548D58A1B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {70FAC855-CAC6-4523-8477-880548D58A1B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {70FAC855-CAC6-4523-8477-880548D58A1B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {70FAC855-CAC6-4523-8477-880548D58A1B}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.AccessControl/ref/Configurations.props b/src/libraries/System.Security.AccessControl/ref/Configurations.props
index d989739..a60680c 100644 (file)
--- a/src/libraries/System.Security.AccessControl/ref/Configurations.props
+++ b/src/libraries/System.Security.AccessControl/ref/Configurations.props
@@ -6,8 +6,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj
index 9a9a247..9cd66c9 100644 (file)
--- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj
+++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.AccessControl.cs" />

diff --git a/src/libraries/System.Security.AccessControl/src/Configurations.props b/src/libraries/System.Security.AccessControl/src/Configurations.props
index 383d49f..43a5039 100644 (file)
--- a/src/libraries/System.Security.AccessControl/src/Configurations.props
+++ b/src/libraries/System.Security.AccessControl/src/Configurations.props
@@ -7,8 +7,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
index 8454dc6..28576b8 100644 (file)
--- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
+++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
     <Reference Include="mscorlib" />

diff --git a/src/libraries/System.Security.AccessControl/tests/Configurations.props b/src/libraries/System.Security.AccessControl/tests/Configurations.props
index 8bfb431..96779f4 100644 (file)
--- a/src/libraries/System.Security.AccessControl/tests/Configurations.props
+++ b/src/libraries/System.Security.AccessControl/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj b/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj
index e14d85e..9eff2f0 100644 (file)
--- a/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj
+++ b/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <UnsupportedPlatforms>Linux;NetBSD;OSX</UnsupportedPlatforms>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Ace\Ace.Common.Tests.cs" />

diff --git a/src/libraries/System.Security.Claims/System.Security.Claims.sln b/src/libraries/System.Security.Claims/System.Security.Claims.sln
index 888258c..9f92381 100644 (file)
--- a/src/libraries/System.Security.Claims/System.Security.Claims.sln
+++ b/src/libraries/System.Security.Claims/System.Security.Claims.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {BE8B728D-86C1-406F-8F5F-6656EC486B01}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {BE8B728D-86C1-406F-8F5F-6656EC486B01}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {BE8B728D-86C1-406F-8F5F-6656EC486B01}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {BE8B728D-86C1-406F-8F5F-6656EC486B01}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {4372807C-BD21-476F-BCE2-3D192AC0B96C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4372807C-BD21-476F-BCE2-3D192AC0B96C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4372807C-BD21-476F-BCE2-3D192AC0B96C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4372807C-BD21-476F-BCE2-3D192AC0B96C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {BE8B728D-86C1-406F-8F5F-6656EC486B01}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {BE8B728D-86C1-406F-8F5F-6656EC486B01}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {BE8B728D-86C1-406F-8F5F-6656EC486B01}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {BE8B728D-86C1-406F-8F5F-6656EC486B01}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {4372807C-BD21-476F-BCE2-3D192AC0B96C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4372807C-BD21-476F-BCE2-3D192AC0B96C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4372807C-BD21-476F-BCE2-3D192AC0B96C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4372807C-BD21-476F-BCE2-3D192AC0B96C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.Claims/ref/Configurations.props b/src/libraries/System.Security.Claims/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.Claims/ref/Configurations.props
+++ b/src/libraries/System.Security.Claims/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Claims/ref/System.Security.Claims.csproj b/src/libraries/System.Security.Claims/ref/System.Security.Claims.csproj
index 0d60e21..f50b035 100644 (file)
--- a/src/libraries/System.Security.Claims/ref/System.Security.Claims.csproj
+++ b/src/libraries/System.Security.Claims/ref/System.Security.Claims.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Claims.cs" />

diff --git a/src/libraries/System.Security.Claims/src/Configurations.props b/src/libraries/System.Security.Claims/src/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.Claims/src/Configurations.props
+++ b/src/libraries/System.Security.Claims/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj b/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj
index 13c6661..ce7eecb 100644 (file)
--- a/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj
+++ b/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>System.Security.Claims</AssemblyName>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <ItemGroup>

diff --git a/src/libraries/System.Security.Claims/tests/Configurations.props b/src/libraries/System.Security.Claims/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.Claims/tests/Configurations.props
+++ b/src/libraries/System.Security.Claims/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Claims/tests/System.Security.Claims.Tests.csproj b/src/libraries/System.Security.Claims/tests/System.Security.Claims.Tests.csproj
index ac9a15f..701ca4a 100644 (file)
--- a/src/libraries/System.Security.Claims/tests/System.Security.Claims.Tests.csproj
+++ b/src/libraries/System.Security.Claims/tests/System.Security.Claims.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ClaimsIdentityTests.cs" />

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln b/src/libraries/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln
index b3bb2d9..932d777 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln
+++ b/src/libraries/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/ref/Configurations.props b/src/libraries/System.Security.Cryptography.Algorithms/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Algorithms/ref/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Algorithms/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj b/src/libraries/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj
index 1ca94c0..f1ac1e0 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj
+++ b/src/libraries/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.Algorithms.cs" />

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/src/Configurations.props b/src/libraries/System.Security.Cryptography.Algorithms/src/Configurations.props
index 35d4ba2..029aafc 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Algorithms/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Algorithms/src/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-OSX;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj b/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj
index 638a0be..0dd40e5 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj
+++ b/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);INTERNAL_ASYMMETRIC_IMPLEMENTATIONS</DefineConstants>
     <NoWarn>CS1573;CS3016;CA5350;CA5351;CA5379;CA5384;CA5385;$(NoWarn)</NoWarn>
-    <Configurations>netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <Import Project="$(CommonPath)System\Security\Cryptography\Asn1\AsnXml.targets"/>
   <Import Project="$(CommonPath)System\Security\Cryptography\Asn1Reader\System.Security.Cryptography.Asn1Reader.Shared.projitems" />

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Algorithms/tests/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Algorithms/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Algorithms/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj
index b06bee7..a8f2106 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\PositionValueStream.cs">

diff --git a/src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln b/src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln
index c706f97..ea9aad7 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln
+++ b/src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {FF53459F-66F7-4F00-8D36-DF440CE18419}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {FF53459F-66F7-4F00-8D36-DF440CE18419}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {FF53459F-66F7-4F00-8D36-DF440CE18419}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {FF53459F-66F7-4F00-8D36-DF440CE18419}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {9FD12550-3A7C-49D3-9A1E-C4B7410989DD}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {9FD12550-3A7C-49D3-9A1E-C4B7410989DD}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {9FD12550-3A7C-49D3-9A1E-C4B7410989DD}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {9FD12550-3A7C-49D3-9A1E-C4B7410989DD}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {FF53459F-66F7-4F00-8D36-DF440CE18419}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {FF53459F-66F7-4F00-8D36-DF440CE18419}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {FF53459F-66F7-4F00-8D36-DF440CE18419}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {FF53459F-66F7-4F00-8D36-DF440CE18419}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {9FD12550-3A7C-49D3-9A1E-C4B7410989DD}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {9FD12550-3A7C-49D3-9A1E-C4B7410989DD}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {9FD12550-3A7C-49D3-9A1E-C4B7410989DD}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {9FD12550-3A7C-49D3-9A1E-C4B7410989DD}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.Cryptography.Cng/ref/Configurations.props b/src/libraries/System.Security.Cryptography.Cng/ref/Configurations.props
index 759cccb..a0100bb 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Cng/ref/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Cng/ref/Configurations.props
@@ -9,8 +9,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj b/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj
index d26862c..2db1780 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj
+++ b/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj
@@ -6,7 +6,7 @@
     <!-- FEATURE_ECDH_DERIVEFROM is technically also available on net462+, but it doesn't require being enabled since it is a facade -->
     <DefineConstants Condition="'$(TargetsNetCoreApp)' == 'true' or '$(TargetsNetStandard)' == 'true'">$(DefineConstants);FEATURE_ECDH_DERIVEFROM</DefineConstants>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;net462-Debug;net462-Release;net47-Debug;net47-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netfx-Debug;netfx-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;net462-Debug;net462-Release;net47-Debug;net47-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.Cng.cs" />
@@ -15,7 +15,7 @@
     <Reference Include="mscorlib" />
     <Reference Include="System.Core" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" />
     <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" />

diff --git a/src/libraries/System.Security.Cryptography.Cng/src/Configurations.props b/src/libraries/System.Security.Cryptography.Cng/src/Configurations.props
index 2df0b77..80f1440 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Cng/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Cng/src/Configurations.props
@@ -11,9 +11,9 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netcoreapp-Windows_NT;
-      netcoreapp;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj b/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
index a2bdfe1..0111854 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
+++ b/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
@@ -5,7 +5,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <OmitResources Condition="'$(IsPartialFacadeAssembly)' == 'true'">true</OmitResources>
     <GenFacadesIgnoreMissingTypes Condition="'$(TargetFramework)' == 'net461'">true</GenFacadesIgnoreMissingTypes>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;net462-Windows_NT-Debug;net462-Windows_NT-Release;net47-Windows_NT-Debug;net47-Windows_NT-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;net462-Windows_NT-Debug;net462-Windows_NT-Release;net47-Windows_NT-Debug;net47-Windows_NT-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetsWindows)' != 'true'">
     <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_CryptographyCng</GeneratePlatformNotSupportedAssemblyMessage>

diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Cng/tests/Configurations.props
index 1ce60d7..5d1ec52 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Cng/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Cng/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
index 37f38cb..d954de0 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);TESTING_CNG_IMPLEMENTATION</DefineConstants>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CreateTests.cs" />

diff --git a/src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln b/src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln
index 10ebc9a..ca9e012 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln
+++ b/src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A05C2EF2-A986-448C-9C63-735CC17409AA}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {A05C2EF2-A986-448C-9C63-735CC17409AA}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {A05C2EF2-A986-448C-9C63-735CC17409AA}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {A05C2EF2-A986-448C-9C63-735CC17409AA}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {FD10679A-8C98-42E6-B7E5-9424E5443912}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {FD10679A-8C98-42E6-B7E5-9424E5443912}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {FD10679A-8C98-42E6-B7E5-9424E5443912}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {FD10679A-8C98-42E6-B7E5-9424E5443912}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {A05C2EF2-A986-448C-9C63-735CC17409AA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A05C2EF2-A986-448C-9C63-735CC17409AA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A05C2EF2-A986-448C-9C63-735CC17409AA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {A05C2EF2-A986-448C-9C63-735CC17409AA}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {FD10679A-8C98-42E6-B7E5-9424E5443912}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {FD10679A-8C98-42E6-B7E5-9424E5443912}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {FD10679A-8C98-42E6-B7E5-9424E5443912}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {FD10679A-8C98-42E6-B7E5-9424E5443912}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.Cryptography.Csp/ref/Configurations.props b/src/libraries/System.Security.Cryptography.Csp/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Csp/ref/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Csp/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj b/src/libraries/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj
index d1611a6..c2c3e12 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj
+++ b/src/libraries/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.Csp.cs" />

diff --git a/src/libraries/System.Security.Cryptography.Csp/src/Configurations.props b/src/libraries/System.Security.Cryptography.Csp/src/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Csp/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Csp/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj
index e799aba..88b1fd0 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj
+++ b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CA5373</NoWarn>
     <NoWarn Condition="'$(TargetsUnix)' == 'true'">$(NoWarn);CS0809</NoWarn>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Security\Cryptography\AesCryptoServiceProvider.cs" />

diff --git a/src/libraries/System.Security.Cryptography.Csp/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Csp/tests/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Csp/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Csp/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
index e2c5a5f..c0e8273 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CreateTransformCompat.cs" />

diff --git a/src/libraries/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln b/src/libraries/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln
index cd1df07..bf7d39e 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln
+++ b/src/libraries/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {0581E9FA-D639-4B88-96D8-D092760F90B0}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {0581E9FA-D639-4B88-96D8-D092760F90B0}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {0581E9FA-D639-4B88-96D8-D092760F90B0}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {0581E9FA-D639-4B88-96D8-D092760F90B0}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {AA81E343-5E54-40B0-9381-C459419BE780}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {AA81E343-5E54-40B0-9381-C459419BE780}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {AA81E343-5E54-40B0-9381-C459419BE780}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {AA81E343-5E54-40B0-9381-C459419BE780}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {0581E9FA-D639-4B88-96D8-D092760F90B0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {0581E9FA-D639-4B88-96D8-D092760F90B0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {0581E9FA-D639-4B88-96D8-D092760F90B0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {0581E9FA-D639-4B88-96D8-D092760F90B0}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {AA81E343-5E54-40B0-9381-C459419BE780}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {AA81E343-5E54-40B0-9381-C459419BE780}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {AA81E343-5E54-40B0-9381-C459419BE780}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {AA81E343-5E54-40B0-9381-C459419BE780}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.Cryptography.Encoding/ref/Configurations.props b/src/libraries/System.Security.Cryptography.Encoding/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Encoding/ref/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Encoding/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj b/src/libraries/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj
index 16ac007..0ecd680 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj
+++ b/src/libraries/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.Encoding.cs" />

diff --git a/src/libraries/System.Security.Cryptography.Encoding/src/Configurations.props b/src/libraries/System.Security.Cryptography.Encoding/src/Configurations.props
index 28007ae..01aaf3e 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Encoding/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Encoding/src/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-OSX;
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj b/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj
index 5166b73..6794bf7 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj
+++ b/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Security.Cryptography.Encoding</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <Import Project="$(CommonPath)System\Security\Cryptography\Asn1\AsnXml.targets" Condition=" '$(TargetsOSX)' == 'true' " />
   <Import Project="$(CommonPath)System\Security\Cryptography\Asn1Reader\System.Security.Cryptography.Asn1Reader.Shared.projitems" Condition=" '$(TargetsOSX)' == 'true' " />

diff --git a/src/libraries/System.Security.Cryptography.Encoding/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Encoding/tests/Configurations.props
index 1e8dd5d..30c654b 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Encoding/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Encoding/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj b/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj
index 5b6bf1a..edf3259 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <Import Project="$(CommonPath)System\Security\Cryptography\Asn1Reader\System.Security.Cryptography.Asn1Reader.Shared.projitems" />
   <ItemGroup>

diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln b/src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln
index a243ad2..9f6d4d7 100644 (file)
--- a/src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Debug|Any CPU.ActiveCfg = netcoreapp-Unix-Debug|Any CPU
-               {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Debug|Any CPU.Build.0 = netcoreapp-Unix-Debug|Any CPU
-               {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Release|Any CPU.ActiveCfg = netcoreapp-Unix-Release|Any CPU
-               {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Release|Any CPU.Build.0 = netcoreapp-Unix-Release|Any CPU
-               {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {8DEA82EF-2214-4295-8CC1-9FFB9B18838F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {8DEA82EF-2214-4295-8CC1-9FFB9B18838F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {8DEA82EF-2214-4295-8CC1-9FFB9B18838F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {8DEA82EF-2214-4295-8CC1-9FFB9B18838F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Unix-Debug|Any CPU
+               {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Debug|Any CPU.Build.0 = netcoreapp5.0-Unix-Debug|Any CPU
+               {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Unix-Release|Any CPU
+               {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Release|Any CPU.Build.0 = netcoreapp5.0-Unix-Release|Any CPU
+               {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {8DEA82EF-2214-4295-8CC1-9FFB9B18838F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {8DEA82EF-2214-4295-8CC1-9FFB9B18838F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {8DEA82EF-2214-4295-8CC1-9FFB9B18838F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {8DEA82EF-2214-4295-8CC1-9FFB9B18838F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/ref/Configurations.props b/src/libraries/System.Security.Cryptography.OpenSsl/ref/Configurations.props
index 9380a92..dfa70b9 100644 (file)
--- a/src/libraries/System.Security.Cryptography.OpenSsl/ref/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/ref/Configurations.props
@@ -5,7 +5,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj
index c8d2389..5cbf72d 100644 (file)
--- a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.OpenSsl.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" />
     <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" />

diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/src/Configurations.props b/src/libraries/System.Security.Cryptography.OpenSsl/src/Configurations.props
index bd25f9d..59fc8cb 100644 (file)
--- a/src/libraries/System.Security.Cryptography.OpenSsl/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/src/Configurations.props
@@ -7,8 +7,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Unix;
-      netcoreapp;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj
index 64d77fc..a825dd9 100644 (file)
--- a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard2.0'">4.1.0.0</AssemblyVersion>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netcoreapp3.0-Unix-Debug;netcoreapp3.0-Unix-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netcoreapp3.0-Unix-Debug;netcoreapp3.0-Unix-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetsUnix)' != 'true'">
     <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_CryptographyOpenSSL</GeneratePlatformNotSupportedAssemblyMessage>

diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/Configurations.props b/src/libraries/System.Security.Cryptography.OpenSsl/tests/Configurations.props
index 6eee71a..9e8acfd 100644 (file)
--- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
index 990c28a..3f232a6 100644 (file)
--- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <UnsupportedPlatforms>Windows_NT</UnsupportedPlatforms>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="EcDsaOpenSslTests.cs" />

diff --git a/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props b/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props
index 4d5b11e..1497ebd 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props
+++ b/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <!-- Currently the netstandard build is locked to the netfx API -->
+    <!-- Currently the netstandard build is locked to the $(NetFrameworkCurrent) API -->
     <AssemblyVersion Condition="'$(TargetsNetStandard)' == 'true'">4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
   </PropertyGroup>

diff --git a/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln b/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln
index eec643d..44d8d54 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln
+++ b/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {03D84CBD-896D-4B2F-9A22-07034F51E73D}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {03D84CBD-896D-4B2F-9A22-07034F51E73D}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {03D84CBD-896D-4B2F-9A22-07034F51E73D}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {03D84CBD-896D-4B2F-9A22-07034F51E73D}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {881269F5-9F22-4427-8DC5-63E2C05875BA}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {881269F5-9F22-4427-8DC5-63E2C05875BA}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {881269F5-9F22-4427-8DC5-63E2C05875BA}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {881269F5-9F22-4427-8DC5-63E2C05875BA}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {03D84CBD-896D-4B2F-9A22-07034F51E73D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {03D84CBD-896D-4B2F-9A22-07034F51E73D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {03D84CBD-896D-4B2F-9A22-07034F51E73D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {03D84CBD-896D-4B2F-9A22-07034F51E73D}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {881269F5-9F22-4427-8DC5-63E2C05875BA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {881269F5-9F22-4427-8DC5-63E2C05875BA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {881269F5-9F22-4427-8DC5-63E2C05875BA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {881269F5-9F22-4427-8DC5-63E2C05875BA}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.Cryptography.Pkcs/ref/Configurations.props b/src/libraries/System.Security.Cryptography.Pkcs/ref/Configurations.props
index c6f6519..e76db9d 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Pkcs/ref/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Pkcs/ref/Configurations.props
@@ -7,8 +7,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netfx;
-      netcoreapp;      
+      $(NetFrameworkCurrent);
+      $(NetCoreAppCurrent)      
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj
index fbf06d3..682ec17 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj
+++ b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netfx-Debug;netfx-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.Pkcs.cs" />
@@ -12,7 +12,7 @@
     <Reference Include="System" />
     <Reference Include="System.Security" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" />
     <ProjectReference Include="..\..\System.Security.Cryptography.Csp\ref\System.Security.Cryptography.Csp.csproj" />

diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/Configurations.props b/src/libraries/System.Security.Cryptography.Pkcs/src/Configurations.props
index 8302dec..2176ece 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Pkcs/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Pkcs/src/Configurations.props
@@ -11,9 +11,9 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netfx-Windows_NT;
-      netcoreapp-Windows_NT;
-      netcoreapp;
+      $(NetFrameworkCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
index f04fd38..7308434 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
+++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
@@ -7,7 +7,7 @@
     <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
     <NoWarn>$(NoWarn);CS1574;CS3016;CA5379;CA5384</NoWarn>
     <Nullable>annotations</Nullable>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release;netstandard2.1-Debug;netstandard2.1-Release;netstandard2.1-Windows_NT-Debug;netstandard2.1-Windows_NT-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release;netstandard2.1-Debug;netstandard2.1-Release;netstandard2.1-Windows_NT-Debug;netstandard2.1-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <Import Project="$(CommonPath)System\Security\Cryptography\Asn1\AsnXml.targets" Condition="'$(IsPartialFacadeAssembly)' != 'true'" />
   <Import Project="$(CommonPath)System\Security\Cryptography\Asn1Reader\System.Security.Cryptography.Asn1Reader.Shared.projitems" Condition="'$(IsPartialFacadeAssembly)' != 'true'" />

diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Pkcs/tests/Configurations.props
index 9808a1a..2d00958 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Pkcs/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
index b11241b..9a6ac34 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs">

diff --git a/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln b/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln
index 7352af9..e0173db 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln
+++ b/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {101EB757-55A4-4F48-841C-C088640B8F57}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {101EB757-55A4-4F48-841C-C088640B8F57}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {101EB757-55A4-4F48-841C-C088640B8F57}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {101EB757-55A4-4F48-841C-C088640B8F57}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {F050C895-297F-41C6-98C3-406D791AD515}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F050C895-297F-41C6-98C3-406D791AD515}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F050C895-297F-41C6-98C3-406D791AD515}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F050C895-297F-41C6-98C3-406D791AD515}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {101EB757-55A4-4F48-841C-C088640B8F57}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {101EB757-55A4-4F48-841C-C088640B8F57}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {101EB757-55A4-4F48-841C-C088640B8F57}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {101EB757-55A4-4F48-841C-C088640B8F57}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {F050C895-297F-41C6-98C3-406D791AD515}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F050C895-297F-41C6-98C3-406D791AD515}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F050C895-297F-41C6-98C3-406D791AD515}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F050C895-297F-41C6-98C3-406D791AD515}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.Cryptography.Primitives/ref/Configurations.props b/src/libraries/System.Security.Cryptography.Primitives/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Primitives/ref/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Primitives/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj b/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj
index 431356d..bd89a86 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj
+++ b/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Security.Cryptography.Primitives/src/Configurations.props b/src/libraries/System.Security.Cryptography.Primitives/src/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Primitives/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Primitives/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj b/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj
index 935454e..89e1350 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj
+++ b/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Security.Cryptography.Primitives</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Security.Cryptography.Primitives/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Primitives/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Primitives/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Primitives/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj b/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj
index d860ac3..23f7ebe 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(CommonTestPath)Tests.props" />
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\PositionValueStream.cs">

diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln b/src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln
index ef8f7dc..41719cf 100644 (file)
--- a/src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {FB39F994-1504-4B96-9588-E0385D3B73F1}.Debug|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Debug|Any CPU
                {FB39F994-1504-4B96-9588-E0385D3B73F1}.Debug|Any CPU.Build.0 = netstandard2.0-Windows_NT-Debug|Any CPU
                {FB39F994-1504-4B96-9588-E0385D3B73F1}.Release|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Release|Any CPU

diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/ref/Configurations.props b/src/libraries/System.Security.Cryptography.ProtectedData/ref/Configurations.props
index 4133f38..71ed45d 100644 (file)
--- a/src/libraries/System.Security.Cryptography.ProtectedData/ref/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/ref/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj
index 482f0d6..1256ed5 100644 (file)
--- a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.ProtectedData.cs" />

diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/src/Configurations.props b/src/libraries/System.Security.Cryptography.ProtectedData/src/Configurations.props
index 017cf13..0a69df7 100644 (file)
--- a/src/libraries/System.Security.Cryptography.ProtectedData/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/src/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netfx-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj
index 3378036..f95feb9 100644 (file)
--- a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj
@@ -5,7 +5,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <OmitResources Condition="'$(TargetsNetFx)' == 'true'">true</OmitResources>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true' and '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_CryptographyProtectedData</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' and ('$(TargetsNetStandard)' != 'true' or '$(TargetsWindows)' == 'true')">
     <Compile Include="System\Security\Cryptography\DataProtectionScope.cs" />

diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/tests/Configurations.props b/src/libraries/System.Security.Cryptography.ProtectedData/tests/Configurations.props
index 8bfb431..96779f4 100644 (file)
--- a/src/libraries/System.Security.Cryptography.ProtectedData/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj
index 6ef0cce..03f0aeb 100644 (file)
--- a/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ProtectedDataTests.cs" />

diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln b/src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln
index 497d068..f41b595 100644 (file)
--- a/src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A28B0064-EFB2-4B77-B97C-DECF5DAB074E}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {A28B0064-EFB2-4B77-B97C-DECF5DAB074E}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {A28B0064-EFB2-4B77-B97C-DECF5DAB074E}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {A28B0064-EFB2-4B77-B97C-DECF5DAB074E}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {6F8576C2-6CD0-4DF3-8394-00B002D82E40}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {6F8576C2-6CD0-4DF3-8394-00B002D82E40}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {6F8576C2-6CD0-4DF3-8394-00B002D82E40}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {6F8576C2-6CD0-4DF3-8394-00B002D82E40}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {B37248D0-B191-4971-AD50-01CFEDF1E09B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B37248D0-B191-4971-AD50-01CFEDF1E09B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B37248D0-B191-4971-AD50-01CFEDF1E09B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B37248D0-B191-4971-AD50-01CFEDF1E09B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {A28B0064-EFB2-4B77-B97C-DECF5DAB074E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A28B0064-EFB2-4B77-B97C-DECF5DAB074E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {A28B0064-EFB2-4B77-B97C-DECF5DAB074E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {A28B0064-EFB2-4B77-B97C-DECF5DAB074E}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {6F8576C2-6CD0-4DF3-8394-00B002D82E40}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {6F8576C2-6CD0-4DF3-8394-00B002D82E40}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {6F8576C2-6CD0-4DF3-8394-00B002D82E40}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {6F8576C2-6CD0-4DF3-8394-00B002D82E40}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {B37248D0-B191-4971-AD50-01CFEDF1E09B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B37248D0-B191-4971-AD50-01CFEDF1E09B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B37248D0-B191-4971-AD50-01CFEDF1E09B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B37248D0-B191-4971-AD50-01CFEDF1E09B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/ref/Configurations.props b/src/libraries/System.Security.Cryptography.X509Certificates/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.Cryptography.X509Certificates/ref/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj
index 9f3ca26..b05980e 100644 (file)
--- a/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.X509Certificates.cs" />

diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/src/Configurations.props b/src/libraries/System.Security.Cryptography.X509Certificates/src/Configurations.props
index 28007ae..01aaf3e 100644 (file)
--- a/src/libraries/System.Security.Cryptography.X509Certificates/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/src/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-OSX;
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
index 2af6825..9f710ef 100644 (file)
--- a/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>System.Security.Cryptography.X509Certificates</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS3016;CA5379;CA5384;CA5385</NoWarn>
-    <Configurations>netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <Import Project="$(CommonPath)System\Security\Cryptography\Asn1\AsnXml.targets" />
   <Import Project="$(CommonPath)System\Security\Cryptography\Asn1Reader\System.Security.Cryptography.Asn1Reader.Shared.projitems" />

diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/Configurations.props b/src/libraries/System.Security.Cryptography.X509Certificates/tests/Configurations.props
index 28007ae..01aaf3e 100644 (file)
--- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/Configurations.props
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-OSX;
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-OSX;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
index 1669f9d..3daa74c 100644 (file)
--- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
@@ -4,7 +4,7 @@
     <DefineConstants>$(DefineConstants);HAVE_THUMBPRINT_OVERLOADS</DefineConstants>
     <DefineConstants Condition="'$(TargetsUnix)' == 'true'">$(DefineConstants);Unix</DefineConstants>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-OSX-Debug;$(NetCoreAppCurrent)-OSX-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <Import Project="$(CommonPath)System\Security\Cryptography\Asn1Reader\System.Security.Cryptography.Asn1Reader.Shared.projitems" />
   <ItemGroup>

diff --git a/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln b/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln
index 686f960..0c08cc3 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln
+++ b/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {4A85232C-E914-4E06-8542-26DAF4B22D60}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4A85232C-E914-4E06-8542-26DAF4B22D60}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4A85232C-E914-4E06-8542-26DAF4B22D60}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4A85232C-E914-4E06-8542-26DAF4B22D60}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {4A85232C-E914-4E06-8542-26DAF4B22D60}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4A85232C-E914-4E06-8542-26DAF4B22D60}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4A85232C-E914-4E06-8542-26DAF4B22D60}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4A85232C-E914-4E06-8542-26DAF4B22D60}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Security.Cryptography.Xml/ref/Configurations.props b/src/libraries/System.Security.Cryptography.Xml/ref/Configurations.props
index e3aaea2..9b0db82 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Xml/ref/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Xml/ref/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj
index 2aa36cb..cba5e53 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj
+++ b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
     <ProjectReference Include="..\..\System.Security.Permissions\ref\System.Security.Permissions.csproj" />

diff --git a/src/libraries/System.Security.Cryptography.Xml/src/Configurations.props b/src/libraries/System.Security.Cryptography.Xml/src/Configurations.props
index 3d8c7a5..1af515c 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Xml/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Xml/src/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj
index 66f2290..47207d7 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj
+++ b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <NoWarn>$(NoWarn);CA5384;CA5385</NoWarn>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
     <Compile Include="System\Security\Cryptography\Xml\AncestralNamespaceContextManager.cs" />

diff --git a/src/libraries/System.Security.Cryptography.Xml/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Xml/tests/Configurations.props
index b668337..eba89a9 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Xml/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Xml/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj b/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj
index 53d5c03..ee54bbe 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <RootNamespace>System.Security.Cryptography.Xml.Tests</RootNamespace>

diff --git a/src/libraries/System.Security.Permissions/System.Security.Permissions.sln b/src/libraries/System.Security.Permissions/System.Security.Permissions.sln
index 04b027d..55a840a 100644 (file)
--- a/src/libraries/System.Security.Permissions/System.Security.Permissions.sln
+++ b/src/libraries/System.Security.Permissions/System.Security.Permissions.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {7517F1E9-EEB4-4676-A054-CE4A44A66B66}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7517F1E9-EEB4-4676-A054-CE4A44A66B66}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7517F1E9-EEB4-4676-A054-CE4A44A66B66}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7517F1E9-EEB4-4676-A054-CE4A44A66B66}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {07390899-C8F6-4E83-A3A9-6867B8CB46A0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {07390899-C8F6-4E83-A3A9-6867B8CB46A0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {07390899-C8F6-4E83-A3A9-6867B8CB46A0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {07390899-C8F6-4E83-A3A9-6867B8CB46A0}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {07CAF142-B259-418E-86EF-C4BD8B50253E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {07CAF142-B259-418E-86EF-C4BD8B50253E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {07CAF142-B259-418E-86EF-C4BD8B50253E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {07CAF142-B259-418E-86EF-C4BD8B50253E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {7517F1E9-EEB4-4676-A054-CE4A44A66B66}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7517F1E9-EEB4-4676-A054-CE4A44A66B66}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7517F1E9-EEB4-4676-A054-CE4A44A66B66}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7517F1E9-EEB4-4676-A054-CE4A44A66B66}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {07390899-C8F6-4E83-A3A9-6867B8CB46A0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {07390899-C8F6-4E83-A3A9-6867B8CB46A0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {07390899-C8F6-4E83-A3A9-6867B8CB46A0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {07390899-C8F6-4E83-A3A9-6867B8CB46A0}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {07CAF142-B259-418E-86EF-C4BD8B50253E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {07CAF142-B259-418E-86EF-C4BD8B50253E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {07CAF142-B259-418E-86EF-C4BD8B50253E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {07CAF142-B259-418E-86EF-C4BD8B50253E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.Permissions/ref/Configurations.props b/src/libraries/System.Security.Permissions/ref/Configurations.props
index 1c0ad46..46b5556 100644 (file)
--- a/src/libraries/System.Security.Permissions/ref/Configurations.props
+++ b/src/libraries/System.Security.Permissions/ref/Configurations.props
@@ -7,8 +7,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj
index 8f4df14..b77fad6 100644 (file)
--- a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj
+++ b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Permissions.cs" />
@@ -27,7 +27,7 @@
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true'">
     <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" />
     <ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" />
     <ProjectReference Include="..\..\System.Data.Common\ref\System.Data.Common.csproj" />

diff --git a/src/libraries/System.Security.Permissions/src/Configurations.props b/src/libraries/System.Security.Permissions/src/Configurations.props
index 2b629ef..97f0321 100644 (file)
--- a/src/libraries/System.Security.Permissions/src/Configurations.props
+++ b/src/libraries/System.Security.Permissions/src/Configurations.props
@@ -7,8 +7,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj
index e17eaf7..02f65c4 100644 (file)
--- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj
+++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true'">
     <Compile Include="System\ApplicationIdentity.cs" />

diff --git a/src/libraries/System.Security.Permissions/tests/Configurations.props b/src/libraries/System.Security.Permissions/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.Permissions/tests/Configurations.props
+++ b/src/libraries/System.Security.Permissions/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj b/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj
index 4cb7e46..b8a76cb 100644 (file)
--- a/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj
+++ b/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ApplicationTrustTests.cs" />
@@ -18,7 +18,7 @@
     <Compile Include="SecurityElementTests.cs" />
     <Compile Include="TrustManagerContextTests.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' And '$(TargetsWindows)' == 'true'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)' And '$(TargetsWindows)' == 'true'">
     <Compile Include="XamlLoadPermissionTests.cs"/>
   </ItemGroup>
 </Project>

diff --git a/src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln b/src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln
index af9e5ca..5d8b412 100644 (file)
--- a/src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln
+++ b/src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {6C36F3AC-54A1-4021-9F5D-CDEFF7347277}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {6C36F3AC-54A1-4021-9F5D-CDEFF7347277}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {6C36F3AC-54A1-4021-9F5D-CDEFF7347277}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {6C36F3AC-54A1-4021-9F5D-CDEFF7347277}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F9E9894E-2513-4085-9046-311AD49D8AE6}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {F9E9894E-2513-4085-9046-311AD49D8AE6}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {F9E9894E-2513-4085-9046-311AD49D8AE6}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {F9E9894E-2513-4085-9046-311AD49D8AE6}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {25A02E40-D12C-4184-B599-E4F954D142DB}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {25A02E40-D12C-4184-B599-E4F954D142DB}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {25A02E40-D12C-4184-B599-E4F954D142DB}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {25A02E40-D12C-4184-B599-E4F954D142DB}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {6C36F3AC-54A1-4021-9F5D-CDEFF7347277}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {6C36F3AC-54A1-4021-9F5D-CDEFF7347277}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {6C36F3AC-54A1-4021-9F5D-CDEFF7347277}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {6C36F3AC-54A1-4021-9F5D-CDEFF7347277}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F9E9894E-2513-4085-9046-311AD49D8AE6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F9E9894E-2513-4085-9046-311AD49D8AE6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F9E9894E-2513-4085-9046-311AD49D8AE6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F9E9894E-2513-4085-9046-311AD49D8AE6}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {25A02E40-D12C-4184-B599-E4F954D142DB}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {25A02E40-D12C-4184-B599-E4F954D142DB}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {25A02E40-D12C-4184-B599-E4F954D142DB}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {25A02E40-D12C-4184-B599-E4F954D142DB}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.Principal.Windows/ref/Configurations.props b/src/libraries/System.Security.Principal.Windows/ref/Configurations.props
index 3f827af..fd87b7c 100644 (file)
--- a/src/libraries/System.Security.Principal.Windows/ref/Configurations.props
+++ b/src/libraries/System.Security.Principal.Windows/ref/Configurations.props
@@ -7,8 +7,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj
index bd2f40a..e1908f1 100644 (file)
--- a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj
+++ b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Principal.Windows.cs" />
@@ -10,7 +10,7 @@
     <Reference Include="mscorlib" />
     <Reference Include="System" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Security.Claims\ref\System.Security.Claims.csproj" />
     <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" />

diff --git a/src/libraries/System.Security.Principal.Windows/src/Configurations.props b/src/libraries/System.Security.Principal.Windows/src/Configurations.props
index d10fc6e..236a130 100644 (file)
--- a/src/libraries/System.Security.Principal.Windows/src/Configurations.props
+++ b/src/libraries/System.Security.Principal.Windows/src/Configurations.props
@@ -10,9 +10,9 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
index 02ca7fd..b181dda 100644 (file)
--- a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
+++ b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
@@ -5,7 +5,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <OmitResources Condition="'$(TargetsNetFx)' == 'true'">true</OmitResources>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_Principal</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Unix-Debug;netcoreapp2.0-Unix-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netcoreapp2.1-Unix-Debug;netcoreapp2.1-Unix-Release;netcoreapp2.1-Windows_NT-Debug;netcoreapp2.1-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp2.0-Unix-Debug;netcoreapp2.0-Unix-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netcoreapp2.1-Unix-Debug;netcoreapp2.1-Unix-Release;netcoreapp2.1-Windows_NT-Debug;netcoreapp2.1-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' and '$(TargetsWindows)' == 'true'">
     <Compile Include="Microsoft\Win32\SafeHandles\SafeAccessTokenHandle.cs" />

diff --git a/src/libraries/System.Security.Principal.Windows/tests/Configurations.props b/src/libraries/System.Security.Principal.Windows/tests/Configurations.props
index 8bfb431..96779f4 100644 (file)
--- a/src/libraries/System.Security.Principal.Windows/tests/Configurations.props
+++ b/src/libraries/System.Security.Principal.Windows/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj
index 52a9d12..bba20c6 100644 (file)
--- a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj
+++ b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NTAccount.cs" />

diff --git a/src/libraries/System.Security.Principal/System.Security.Principal.sln b/src/libraries/System.Security.Principal/System.Security.Principal.sln
index 42f7fb5..4053c75 100644 (file)
--- a/src/libraries/System.Security.Principal/System.Security.Principal.sln
+++ b/src/libraries/System.Security.Principal/System.Security.Principal.sln
@@ -19,14 +19,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {FBE16BC8-AE2D-422C-861E-861814F53AF7}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {FBE16BC8-AE2D-422C-861E-861814F53AF7}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {FBE16BC8-AE2D-422C-861E-861814F53AF7}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {FBE16BC8-AE2D-422C-861E-861814F53AF7}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {06ECBECD-4100-474D-8F3C-21A0F66A92A6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {06ECBECD-4100-474D-8F3C-21A0F66A92A6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {06ECBECD-4100-474D-8F3C-21A0F66A92A6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {06ECBECD-4100-474D-8F3C-21A0F66A92A6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {FBE16BC8-AE2D-422C-861E-861814F53AF7}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {FBE16BC8-AE2D-422C-861E-861814F53AF7}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {FBE16BC8-AE2D-422C-861E-861814F53AF7}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {FBE16BC8-AE2D-422C-861E-861814F53AF7}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {06ECBECD-4100-474D-8F3C-21A0F66A92A6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {06ECBECD-4100-474D-8F3C-21A0F66A92A6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {06ECBECD-4100-474D-8F3C-21A0F66A92A6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {06ECBECD-4100-474D-8F3C-21A0F66A92A6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.Principal/ref/Configurations.props b/src/libraries/System.Security.Principal/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.Principal/ref/Configurations.props
+++ b/src/libraries/System.Security.Principal/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Principal/ref/System.Security.Principal.csproj b/src/libraries/System.Security.Principal/ref/System.Security.Principal.csproj
index cab9b15..a29a6a2 100644 (file)
--- a/src/libraries/System.Security.Principal/ref/System.Security.Principal.csproj
+++ b/src/libraries/System.Security.Principal/ref/System.Security.Principal.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Security.Principal/src/Configurations.props b/src/libraries/System.Security.Principal/src/Configurations.props
index ad8296d..eca4299 100644 (file)
--- a/src/libraries/System.Security.Principal/src/Configurations.props
+++ b/src/libraries/System.Security.Principal/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj b/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj
index 8690f05..f41cd48 100644 (file)
--- a/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj
+++ b/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <ItemGroup>

diff --git a/src/libraries/System.Security.SecureString/System.Security.SecureString.sln b/src/libraries/System.Security.SecureString/System.Security.SecureString.sln
index 1de44f6..cc8499b 100644 (file)
--- a/src/libraries/System.Security.SecureString/System.Security.SecureString.sln
+++ b/src/libraries/System.Security.SecureString/System.Security.SecureString.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {69609238-62C7-479D-A8CE-709F41101D3C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {69609238-62C7-479D-A8CE-709F41101D3C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {69609238-62C7-479D-A8CE-709F41101D3C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {69609238-62C7-479D-A8CE-709F41101D3C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {A958BBDD-3238-4E58-AB7F-390AB6D88233}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A958BBDD-3238-4E58-AB7F-390AB6D88233}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A958BBDD-3238-4E58-AB7F-390AB6D88233}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A958BBDD-3238-4E58-AB7F-390AB6D88233}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {899EC05D-7861-447F-9216-67F8547516DD}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {899EC05D-7861-447F-9216-67F8547516DD}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {899EC05D-7861-447F-9216-67F8547516DD}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {899EC05D-7861-447F-9216-67F8547516DD}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {69609238-62C7-479D-A8CE-709F41101D3C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {69609238-62C7-479D-A8CE-709F41101D3C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {69609238-62C7-479D-A8CE-709F41101D3C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {69609238-62C7-479D-A8CE-709F41101D3C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {A958BBDD-3238-4E58-AB7F-390AB6D88233}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A958BBDD-3238-4E58-AB7F-390AB6D88233}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A958BBDD-3238-4E58-AB7F-390AB6D88233}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A958BBDD-3238-4E58-AB7F-390AB6D88233}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {899EC05D-7861-447F-9216-67F8547516DD}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {899EC05D-7861-447F-9216-67F8547516DD}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {899EC05D-7861-447F-9216-67F8547516DD}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {899EC05D-7861-447F-9216-67F8547516DD}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Security.SecureString/ref/Configurations.props b/src/libraries/System.Security.SecureString/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.SecureString/ref/Configurations.props
+++ b/src/libraries/System.Security.SecureString/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.SecureString/ref/System.Security.SecureString.csproj b/src/libraries/System.Security.SecureString/ref/System.Security.SecureString.csproj
index 31f5e33..785ffb0 100644 (file)
--- a/src/libraries/System.Security.SecureString/ref/System.Security.SecureString.csproj
+++ b/src/libraries/System.Security.SecureString/ref/System.Security.SecureString.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.SecureString.cs" />

diff --git a/src/libraries/System.Security.SecureString/src/Configurations.props b/src/libraries/System.Security.SecureString/src/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.SecureString/src/Configurations.props
+++ b/src/libraries/System.Security.SecureString/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.SecureString/src/System.Security.SecureString.csproj b/src/libraries/System.Security.SecureString/src/System.Security.SecureString.csproj
index ec544dc..f08f6bc 100644 (file)
--- a/src/libraries/System.Security.SecureString/src/System.Security.SecureString.csproj
+++ b/src/libraries/System.Security.SecureString/src/System.Security.SecureString.csproj
@@ -3,7 +3,7 @@
     <RootNamespace>System.Security.SecureString</RootNamespace>
     <AssemblyName>System.Security.SecureString</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Runtime" />

diff --git a/src/libraries/System.Security.SecureString/tests/Configurations.props b/src/libraries/System.Security.SecureString/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Security.SecureString/tests/Configurations.props
+++ b/src/libraries/System.Security.SecureString/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj b/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj
index c2738a8..d75bd71 100644 (file)
--- a/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj
+++ b/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln b/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln
index 2ea3dd7..8f47bc1 100644 (file)
--- a/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln
+++ b/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {C2AB129B-E3EC-465B-B1B7-0F7D414B1E74}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {C2AB129B-E3EC-465B-B1B7-0F7D414B1E74}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {C2AB129B-E3EC-465B-B1B7-0F7D414B1E74}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
                {C2AB129B-E3EC-465B-B1B7-0F7D414B1E74}.Release|Any CPU.Build.0 = netstandard2.0-Release|Any CPU
-               {E81F4C7C-2000-4449-BEE6-B2E84DE218F7}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {E81F4C7C-2000-4449-BEE6-B2E84DE218F7}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {E81F4C7C-2000-4449-BEE6-B2E84DE218F7}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {E81F4C7C-2000-4449-BEE6-B2E84DE218F7}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {E81F4C7C-2000-4449-BEE6-B2E84DE218F7}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {E81F4C7C-2000-4449-BEE6-B2E84DE218F7}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {E81F4C7C-2000-4449-BEE6-B2E84DE218F7}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {E81F4C7C-2000-4449-BEE6-B2E84DE218F7}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.ServiceModel.Syndication/ref/Configurations.props b/src/libraries/System.ServiceModel.Syndication/ref/Configurations.props
index fe7059e..5b7a4ac 100644 (file)
--- a/src/libraries/System.ServiceModel.Syndication/ref/Configurations.props
+++ b/src/libraries/System.ServiceModel.Syndication/ref/Configurations.props
@@ -7,8 +7,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj b/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj
index ce438b7..bc97063 100644 (file)
--- a/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj
+++ b/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ServiceModel.Syndication.cs" />
@@ -9,7 +9,7 @@
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="System.ServiceModel.Syndication.netcoreapp.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <ProjectReference Include="..\..\System.Collections\ref\System.Collections.csproj" />
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Runtime.Serialization.Primitives\ref\System.Runtime.Serialization.Primitives.csproj" />

diff --git a/src/libraries/System.ServiceModel.Syndication/src/Configurations.props b/src/libraries/System.ServiceModel.Syndication/src/Configurations.props
index e2e96d8..dcb22a3 100644 (file)
--- a/src/libraries/System.ServiceModel.Syndication/src/Configurations.props
+++ b/src/libraries/System.ServiceModel.Syndication/src/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netfx-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj
index c20c56f..d013090 100644 (file)
--- a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj
+++ b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj
@@ -3,7 +3,7 @@
     <NoWarn>$(NoWarn);1634;1691;649</NoWarn>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <OmitResources Condition="'$(TargetsNetFx)' == 'true'">true</OmitResources>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true'">
     <Compile Include="System\ServiceModel\Channels\UriGenerator.cs" />

diff --git a/src/libraries/System.ServiceModel.Syndication/tests/Configurations.props b/src/libraries/System.ServiceModel.Syndication/tests/Configurations.props
index 2e0339e..3e0106d 100644 (file)
--- a/src/libraries/System.ServiceModel.Syndication/tests/Configurations.props
+++ b/src/libraries/System.ServiceModel.Syndication/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ServiceModel.Syndication/tests/System.ServiceModel.Syndication.Tests.csproj b/src/libraries/System.ServiceModel.Syndication/tests/System.ServiceModel.Syndication.Tests.csproj
index 4621bf1..dc79b3e 100644 (file)
--- a/src/libraries/System.ServiceModel.Syndication/tests/System.ServiceModel.Syndication.Tests.csproj
+++ b/src/libraries/System.ServiceModel.Syndication/tests/System.ServiceModel.Syndication.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BasicScenarioTests.cs" />

diff --git a/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln b/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
index f827681..eff2a70 100644 (file)
--- a/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
+++ b/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
@@ -31,18 +31,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {E62B874D-1A0D-41BC-8CFC-9E09D0860A77}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {E62B874D-1A0D-41BC-8CFC-9E09D0860A77}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {E62B874D-1A0D-41BC-8CFC-9E09D0860A77}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {E62B874D-1A0D-41BC-8CFC-9E09D0860A77}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {F7D9984B-02EB-4573-84EF-00FFFBFB872C}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {F7D9984B-02EB-4573-84EF-00FFFBFB872C}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {F7D9984B-02EB-4573-84EF-00FFFBFB872C}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {F7D9984B-02EB-4573-84EF-00FFFBFB872C}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {E62B874D-1A0D-41BC-8CFC-9E09D0860A77}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {E62B874D-1A0D-41BC-8CFC-9E09D0860A77}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {E62B874D-1A0D-41BC-8CFC-9E09D0860A77}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {E62B874D-1A0D-41BC-8CFC-9E09D0860A77}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {F7D9984B-02EB-4573-84EF-00FFFBFB872C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F7D9984B-02EB-4573-84EF-00FFFBFB872C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F7D9984B-02EB-4573-84EF-00FFFBFB872C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F7D9984B-02EB-4573-84EF-00FFFBFB872C}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {8479566D-6FA5-4241-9D66-524BEC4C19BD}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {8479566D-6FA5-4241-9D66-524BEC4C19BD}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {8479566D-6FA5-4241-9D66-524BEC4C19BD}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.ServiceProcess.ServiceController/ref/Configurations.props b/src/libraries/System.ServiceProcess.ServiceController/ref/Configurations.props
index 688cb93..371f0fb 100644 (file)
--- a/src/libraries/System.ServiceProcess.ServiceController/ref/Configurations.props
+++ b/src/libraries/System.ServiceProcess.ServiceController/ref/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      netfx;
+      $(NetFrameworkCurrent);
       net461;
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj
index 20e8561..c0b5a12 100644 (file)
--- a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ServiceProcess.ServiceController.cs" />

diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/Configurations.props b/src/libraries/System.ServiceProcess.ServiceController/src/Configurations.props
index 4b6540c..8a21201 100644 (file)
--- a/src/libraries/System.ServiceProcess.ServiceController/src/Configurations.props
+++ b/src/libraries/System.ServiceProcess.ServiceController/src/Configurations.props
@@ -7,8 +7,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
index d926ad6..9229fba 100644 (file)
--- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
@@ -4,7 +4,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <OmitResources Condition="'$(TargetsNetFx)' == 'true'">true</OmitResources>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true' and '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_ServiceController</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' or ('$(TargetsNetStandard)' == 'true' and '$(TargetsWindows)' == 'true')">
     <Compile Include="$(CoreLibSharedDir)System\Text\ValueStringBuilder.cs">

diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/Configurations.props b/src/libraries/System.ServiceProcess.ServiceController/tests/Configurations.props
index 8bfb431..96779f4 100644 (file)
--- a/src/libraries/System.ServiceProcess.ServiceController/tests/Configurations.props
+++ b/src/libraries/System.ServiceProcess.ServiceController/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/Configurations.props b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/Configurations.props
index 2e0339e..3e0106d 100644 (file)
--- a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/Configurations.props
+++ b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj
index db2c8ca..ba6b340 100644 (file)
--- a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputType>Exe</OutputType>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Helpers.cs" />

diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj
index b896695..d856dcc 100644 (file)
--- a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ServiceBaseTests.cs" />

diff --git a/src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln b/src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln
index 0553d42..f2b521f 100644 (file)
--- a/src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln
+++ b/src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln
@@ -26,14 +26,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {16EE6633-F557-5C9E-9EF3-B5334B044F47}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {16EE6633-F557-5C9E-9EF3-B5334B044F47}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {16EE6633-F557-5C9E-9EF3-B5334B044F47}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {16EE6633-F557-5C9E-9EF3-B5334B044F47}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {16EE6633-F557-5C9E-9EF3-B5334B044F47}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {16EE6633-F557-5C9E-9EF3-B5334B044F47}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {16EE6633-F557-5C9E-9EF3-B5334B044F47}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {16EE6633-F557-5C9E-9EF3-B5334B044F47}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Text.Encoding.CodePages/src/Configurations.props b/src/libraries/System.Text.Encoding.CodePages/src/Configurations.props
index 123b58b..bc86995 100644 (file)
--- a/src/libraries/System.Text.Encoding.CodePages/src/Configurations.props
+++ b/src/libraries/System.Text.Encoding.CodePages/src/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
index 0965dc9..c2ca25b 100644 (file)
--- a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
+++ b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <!-- copy the Windows-specific implementation to net461 folder so that restore without a RID works -->
     <PackageTargetFramework Condition="'$(TargetsNetStandard)' == 'true' and '$(TargetsWindows)' == 'true'">netstandard2.0;net461</PackageTargetFramework>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft\Win32\SafeHandles\SafeAllocHHandle.cs" />

diff --git a/src/libraries/System.Text.Encoding.CodePages/tests/Configurations.props b/src/libraries/System.Text.Encoding.CodePages/tests/Configurations.props
index 2e0339e..3e0106d 100644 (file)
--- a/src/libraries/System.Text.Encoding.CodePages/tests/Configurations.props
+++ b/src/libraries/System.Text.Encoding.CodePages/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj b/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj
index 9e2f227..b5b5304 100644 (file)
--- a/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj
+++ b/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="EncoderFallbackBufferHelper.cs" />

diff --git a/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln b/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln
index 7b8cf71..73d0311 100644 (file)
--- a/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln
+++ b/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {45ED5323-5E2F-445F-B305-21B3044C87B6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {45ED5323-5E2F-445F-B305-21B3044C87B6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {45ED5323-5E2F-445F-B305-21B3044C87B6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {45ED5323-5E2F-445F-B305-21B3044C87B6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {45ED5323-5E2F-445F-B305-21B3044C87B6}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {45ED5323-5E2F-445F-B305-21B3044C87B6}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {45ED5323-5E2F-445F-B305-21B3044C87B6}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {45ED5323-5E2F-445F-B305-21B3044C87B6}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Text.Encoding.Extensions/ref/Configurations.props b/src/libraries/System.Text.Encoding.Extensions/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Text.Encoding.Extensions/ref/Configurations.props
+++ b/src/libraries/System.Text.Encoding.Extensions/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj b/src/libraries/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj
index 7df37ab..68b488e 100644 (file)
--- a/src/libraries/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj
+++ b/src/libraries/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Text.Encoding.Extensions/src/Configurations.props b/src/libraries/System.Text.Encoding.Extensions/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Text.Encoding.Extensions/src/Configurations.props
+++ b/src/libraries/System.Text.Encoding.Extensions/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj b/src/libraries/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj
index f7b483d..df6104f 100644 (file)
--- a/src/libraries/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj
+++ b/src/libraries/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Text.Encoding.Extensions</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Text.Encoding.Extensions/tests/Configurations.props b/src/libraries/System.Text.Encoding.Extensions/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Text.Encoding.Extensions/tests/Configurations.props
+++ b/src/libraries/System.Text.Encoding.Extensions/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj b/src/libraries/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj
index 17cf6c5..feaadcc 100644 (file)
--- a/src/libraries/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj
+++ b/src/libraries/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Text.Encoding/System.Text.Encoding.sln b/src/libraries/System.Text.Encoding/System.Text.Encoding.sln
index 64ed974..e189f7a 100644 (file)
--- a/src/libraries/System.Text.Encoding/System.Text.Encoding.sln
+++ b/src/libraries/System.Text.Encoding/System.Text.Encoding.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {635F30B9-5566-4096-B772-68FAA9B00DF4}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {635F30B9-5566-4096-B772-68FAA9B00DF4}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {635F30B9-5566-4096-B772-68FAA9B00DF4}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {635F30B9-5566-4096-B772-68FAA9B00DF4}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {635F30B9-5566-4096-B772-68FAA9B00DF4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {635F30B9-5566-4096-B772-68FAA9B00DF4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {635F30B9-5566-4096-B772-68FAA9B00DF4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {635F30B9-5566-4096-B772-68FAA9B00DF4}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Text.Encoding/ref/Configurations.props b/src/libraries/System.Text.Encoding/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Text.Encoding/ref/Configurations.props
+++ b/src/libraries/System.Text.Encoding/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Text.Encoding/ref/System.Text.Encoding.csproj b/src/libraries/System.Text.Encoding/ref/System.Text.Encoding.csproj
index af6f2a7..62ccf19 100644 (file)
--- a/src/libraries/System.Text.Encoding/ref/System.Text.Encoding.csproj
+++ b/src/libraries/System.Text.Encoding/ref/System.Text.Encoding.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Text.Encoding.Forwards.cs" />

diff --git a/src/libraries/System.Text.Encoding/src/Configurations.props b/src/libraries/System.Text.Encoding/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Text.Encoding/src/Configurations.props
+++ b/src/libraries/System.Text.Encoding/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj b/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj
index 42fa234..05cf753 100644 (file)
--- a/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj
+++ b/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Text.Encoding</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Text.Encoding/tests/Configurations.props b/src/libraries/System.Text.Encoding/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Text.Encoding/tests/Configurations.props
+++ b/src/libraries/System.Text.Encoding/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj b/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj
index b1e42d7..ebb638e 100644 (file)
--- a/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj
+++ b/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ASCIIEncoding\ASCIIEncodingEncode.cs" />

diff --git a/src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln b/src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln
index 7c7b8f6..fbf83ce 100644 (file)
--- a/src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln
+++ b/src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {B7EDBF00-765A-48E8-B593-CD668288E274}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {B7EDBF00-765A-48E8-B593-CD668288E274}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {B7EDBF00-765A-48E8-B593-CD668288E274}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU
                {B7EDBF00-765A-48E8-B593-CD668288E274}.Release|Any CPU.Build.0 = netstandard2.0-Release|Any CPU
-               {41648C6D-D431-478D-8228-7EB68714541C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {41648C6D-D431-478D-8228-7EB68714541C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {41648C6D-D431-478D-8228-7EB68714541C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {41648C6D-D431-478D-8228-7EB68714541C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {41648C6D-D431-478D-8228-7EB68714541C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {41648C6D-D431-478D-8228-7EB68714541C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {41648C6D-D431-478D-8228-7EB68714541C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {41648C6D-D431-478D-8228-7EB68714541C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Text.Encodings.Web/ref/Configurations.props b/src/libraries/System.Text.Encodings.Web/ref/Configurations.props
index 9eacde4..b48545a 100644 (file)
--- a/src/libraries/System.Text.Encodings.Web/ref/Configurations.props
+++ b/src/libraries/System.Text.Encodings.Web/ref/Configurations.props
@@ -5,7 +5,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj
index f43d455..5cb73a6 100644 (file)
--- a/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj
+++ b/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/libraries/System.Text.Encodings.Web/src/Configurations.props b/src/libraries/System.Text.Encodings.Web/src/Configurations.props
index f275254..b9f4ea0 100644 (file)
--- a/src/libraries/System.Text.Encodings.Web/src/Configurations.props
+++ b/src/libraries/System.Text.Encodings.Web/src/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
index 616fdec..39c398b 100644 (file)
--- a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
+++ b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Text.Encodings.Web/tests/Configurations.props b/src/libraries/System.Text.Encodings.Web/tests/Configurations.props
index 61b88ac..671d43c 100644 (file)
--- a/src/libraries/System.Text.Encodings.Web/tests/Configurations.props
+++ b/src/libraries/System.Text.Encodings.Web/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj b/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj
index 490ff81..e92a2d2 100644 (file)
--- a/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj
+++ b/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj
@@ -5,7 +5,7 @@
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">

diff --git a/src/libraries/System.Text.Json/System.Text.Json.sln b/src/libraries/System.Text.Json/System.Text.Json.sln
index f6b7bc2..90dcfbf 100644 (file)
--- a/src/libraries/System.Text.Json/System.Text.Json.sln
+++ b/src/libraries/System.Text.Json/System.Text.Json.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {5F553243-042C-45C0-8E49-C739131E11C3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {5F553243-042C-45C0-8E49-C739131E11C3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {5F553243-042C-45C0-8E49-C739131E11C3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {5F553243-042C-45C0-8E49-C739131E11C3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {9F155052-2DDE-4DBD-9F31-ADB45C9FE628}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {9F155052-2DDE-4DBD-9F31-ADB45C9FE628}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {9F155052-2DDE-4DBD-9F31-ADB45C9FE628}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {9F155052-2DDE-4DBD-9F31-ADB45C9FE628}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {5F553243-042C-45C0-8E49-C739131E11C3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {5F553243-042C-45C0-8E49-C739131E11C3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {5F553243-042C-45C0-8E49-C739131E11C3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {5F553243-042C-45C0-8E49-C739131E11C3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {9F155052-2DDE-4DBD-9F31-ADB45C9FE628}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {9F155052-2DDE-4DBD-9F31-ADB45C9FE628}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {9F155052-2DDE-4DBD-9F31-ADB45C9FE628}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {9F155052-2DDE-4DBD-9F31-ADB45C9FE628}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Text.Json/ref/Configurations.props b/src/libraries/System.Text.Json/ref/Configurations.props
index 408b5a8..830a7e8 100644 (file)
--- a/src/libraries/System.Text.Json/ref/Configurations.props
+++ b/src/libraries/System.Text.Json/ref/Configurations.props
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard2.0;
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Text.Json/ref/System.Text.Json.csproj b/src/libraries/System.Text.Json/ref/System.Text.Json.csproj
index fd1251a..7db3c52 100644 (file)
--- a/src/libraries/System.Text.Json/ref/System.Text.Json.csproj
+++ b/src/libraries/System.Text.Json/ref/System.Text.Json.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Text.Json.cs" />

diff --git a/src/libraries/System.Text.Json/src/Configurations.props b/src/libraries/System.Text.Json/src/Configurations.props
index fc5f360..ac38e2e 100644 (file)
--- a/src/libraries/System.Text.Json/src/Configurations.props
+++ b/src/libraries/System.Text.Json/src/Configurations.props
@@ -7,8 +7,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
index 19bd1b0..9daa77e 100644 (file)
--- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj
+++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DocumentationFile>$(OutputPath)$(MSBuildProjectName).xml</DocumentationFile>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
     <!-- For the inbox library (that is shipping with the product), this should always be true. -->
     <!-- BUILDING_INBOX_LIBRARY is only false when building the netstandard compatible NuGet package. -->
     <DefineConstants Condition="'$(TargetsNetCoreApp)' == 'true'">$(DefineConstants);BUILDING_INBOX_LIBRARY</DefineConstants>

diff --git a/src/libraries/System.Text.Json/tests/Configurations.props b/src/libraries/System.Text.Json/tests/Configurations.props
index 61b88ac..671d43c 100644 (file)
--- a/src/libraries/System.Text.Json/tests/Configurations.props
+++ b/src/libraries/System.Text.Json/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj
index 3a4b6ab..7f4d65a 100644 (file)
--- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj
+++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
-    <DefineConstants Condition="'$(TargetGroup)'!='netfx'">$(DefineConstants);BUILDING_INBOX_LIBRARY</DefineConstants>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
+    <DefineConstants Condition="'$(TargetGroup)'!='net472'">$(DefineConstants);BUILDING_INBOX_LIBRARY</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
index bdeee00..a275b3c 100644 (file)
--- a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
+++ b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {94B106C2-D574-4392-80AB-3EE308A078DF}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {94B106C2-D574-4392-80AB-3EE308A078DF}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {94B106C2-D574-4392-80AB-3EE308A078DF}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {94B106C2-D574-4392-80AB-3EE308A078DF}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {2C58640B-5BED-4E83-9554-CD2B9762643F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {2C58640B-5BED-4E83-9554-CD2B9762643F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {2C58640B-5BED-4E83-9554-CD2B9762643F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {2C58640B-5BED-4E83-9554-CD2B9762643F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {B262B15E-13E6-4C1E-A25E-16D06E222A09}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B262B15E-13E6-4C1E-A25E-16D06E222A09}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B262B15E-13E6-4C1E-A25E-16D06E222A09}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B262B15E-13E6-4C1E-A25E-16D06E222A09}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {94B106C2-D574-4392-80AB-3EE308A078DF}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {94B106C2-D574-4392-80AB-3EE308A078DF}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {94B106C2-D574-4392-80AB-3EE308A078DF}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {94B106C2-D574-4392-80AB-3EE308A078DF}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {2C58640B-5BED-4E83-9554-CD2B9762643F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {2C58640B-5BED-4E83-9554-CD2B9762643F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {2C58640B-5BED-4E83-9554-CD2B9762643F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {2C58640B-5BED-4E83-9554-CD2B9762643F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {B262B15E-13E6-4C1E-A25E-16D06E222A09}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B262B15E-13E6-4C1E-A25E-16D06E222A09}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B262B15E-13E6-4C1E-A25E-16D06E222A09}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B262B15E-13E6-4C1E-A25E-16D06E222A09}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Text.RegularExpressions/ref/Configurations.props b/src/libraries/System.Text.RegularExpressions/ref/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Text.RegularExpressions/ref/Configurations.props
+++ b/src/libraries/System.Text.RegularExpressions/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj b/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
index 1d6dffc..efd1f8d 100644 (file)
--- a/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
+++ b/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" />
   </ItemGroup>
   <!-- Required for CompileToAssembly API -->
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <ProjectReference Include="..\..\System.Reflection.Emit.ILGeneration\ref\System.Reflection.Emit.ILGeneration.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/libraries/System.Text.RegularExpressions/src/Configurations.props b/src/libraries/System.Text.RegularExpressions/src/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Text.RegularExpressions/src/Configurations.props
+++ b/src/libraries/System.Text.RegularExpressions/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
index 5f49841..1148092 100644 (file)
--- a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
+++ b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>System.Text.RegularExpressions</AssemblyName>
-    <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);FEATURE_COMPILED</DefineConstants>
-    <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);FEATURE_COMPILEAPIS</DefineConstants>
+    <DefineConstants Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">$(DefineConstants);FEATURE_COMPILED</DefineConstants>
+    <DefineConstants Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">$(DefineConstants);FEATURE_COMPILEAPIS</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
@@ -54,7 +54,7 @@
     <Compile Include="System\Text\ValueStringBuilder.Reverse.cs" />
   </ItemGroup>
   <!-- Files that enable compiled feature -->
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <Compile Include="System\Text\RegularExpressions\CompiledRegexRunnerFactory.cs" />
     <Compile Include="System\Text\RegularExpressions\CompiledRegexRunner.cs" />
     <Compile Include="System\Text\RegularExpressions\RegexCompiler.cs" />
@@ -73,7 +73,7 @@
     <Reference Include="System.Threading" />
   </ItemGroup>
   <!-- References required for compiled feature -->
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <Reference Include="System.Reflection.Emit.ILGeneration" />
     <Reference Include="System.Reflection.Emit.Lightweight" />
     <Reference Include="System.Reflection.Primitives" />

diff --git a/src/libraries/System.Text.RegularExpressions/tests/Configurations.props b/src/libraries/System.Text.RegularExpressions/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Text.RegularExpressions/tests/Configurations.props
+++ b/src/libraries/System.Text.RegularExpressions/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
index 86ce279..bf60979 100644 (file)
--- a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
+++ b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <NoWarn>$(NoWarn);xUnit2008</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
   </PropertyGroup>

diff --git a/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln b/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln
index bb4c50c..89b46e1 100644 (file)
--- a/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln
+++ b/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+               {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
                {E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}.Debug|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Debug|Any CPU
                {E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}.Debug|Any CPU.Build.0 = netstandard2.0-Windows_NT-Debug|Any CPU
                {E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}.Release|Any CPU.ActiveCfg = netstandard2.0-Windows_NT-Release|Any CPU

diff --git a/src/libraries/System.Threading.AccessControl/ref/Configurations.props b/src/libraries/System.Threading.AccessControl/ref/Configurations.props
index a592225..4f26b9c 100644 (file)
--- a/src/libraries/System.Threading.AccessControl/ref/Configurations.props
+++ b/src/libraries/System.Threading.AccessControl/ref/Configurations.props
@@ -6,7 +6,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netfx;
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj
index 7799676..4ab71ba 100644 (file)
--- a/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj
+++ b/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>net461-Debug;net461-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Threading.AccessControl.cs" />

diff --git a/src/libraries/System.Threading.AccessControl/src/Configurations.props b/src/libraries/System.Threading.AccessControl/src/Configurations.props
index 017cf13..0a69df7 100644 (file)
--- a/src/libraries/System.Threading.AccessControl/src/Configurations.props
+++ b/src/libraries/System.Threading.AccessControl/src/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
-      netfx-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj
index 4ac33ba..f41f4ad 100644 (file)
--- a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj
+++ b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj
@@ -3,7 +3,7 @@
     <OSGroup Condition="'$(OSGroup)' == ''">Windows_NT</OSGroup>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true' and '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
+    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">

diff --git a/src/libraries/System.Threading.AccessControl/tests/Configurations.props b/src/libraries/System.Threading.AccessControl/tests/Configurations.props
index 8bfb431..96779f4 100644 (file)
--- a/src/libraries/System.Threading.AccessControl/tests/Configurations.props
+++ b/src/libraries/System.Threading.AccessControl/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetFrameworkCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj b/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj
index 60489e1..1a9c626 100644 (file)
--- a/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj
+++ b/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;$(NetFrameworkCurrent)-Windows_NT-Debug;$(NetFrameworkCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.Constants.cs" Link="Interop\Windows\Kernel32\Interop.Constants.cs" />

diff --git a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln
index c3dffb2..8b8d496 100644 (file)
--- a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln
+++ b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Threading.Channels/ref/Configurations.props b/src/libraries/System.Threading.Channels/ref/Configurations.props
index 0591c57..ff115b6 100644 (file)
--- a/src/libraries/System.Threading.Channels/ref/Configurations.props
+++ b/src/libraries/System.Threading.Channels/ref/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj
index e4e1b54..e40bfe5 100644 (file)
--- a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj
+++ b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
@@ -15,7 +15,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
     <Reference Include="System.Runtime" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <ProjectReference Include="../../System.Runtime/ref/System.Runtime.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">

diff --git a/src/libraries/System.Threading.Channels/src/Configurations.props b/src/libraries/System.Threading.Channels/src/Configurations.props
index 0f362c8..baba43a 100644 (file)
--- a/src/libraries/System.Threading.Channels/src/Configurations.props
+++ b/src/libraries/System.Threading.Channels/src/Configurations.props
@@ -7,7 +7,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj
index 8f99281..1aedd9f 100644 (file)
--- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj
+++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading.Channels/tests/Configurations.props b/src/libraries/System.Threading.Channels/tests/Configurations.props
index 61b88ac..671d43c 100644 (file)
--- a/src/libraries/System.Threading.Channels/tests/Configurations.props
+++ b/src/libraries/System.Threading.Channels/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj
index 25d6a91..25d15b5 100644 (file)
--- a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj
+++ b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BoundedChannelTests.cs" />

diff --git a/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln b/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln
index 759068f..0d81688 100644 (file)
--- a/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln
+++ b/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {861A3318-35AD-46ac-8257-8D5D2479BAD9}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {861A3318-35AD-46ac-8257-8D5D2479BAD9}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {861A3318-35AD-46ac-8257-8D5D2479BAD9}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {861A3318-35AD-46ac-8257-8D5D2479BAD9}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F71467DF-30C1-44A0-A15A-163CB5DB4E6E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F71467DF-30C1-44A0-A15A-163CB5DB4E6E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F71467DF-30C1-44A0-A15A-163CB5DB4E6E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F71467DF-30C1-44A0-A15A-163CB5DB4E6E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {861A3318-35AD-46ac-8257-8D5D2479BAD9}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {861A3318-35AD-46ac-8257-8D5D2479BAD9}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {861A3318-35AD-46ac-8257-8D5D2479BAD9}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {861A3318-35AD-46ac-8257-8D5D2479BAD9}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F71467DF-30C1-44A0-A15A-163CB5DB4E6E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F71467DF-30C1-44A0-A15A-163CB5DB4E6E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F71467DF-30C1-44A0-A15A-163CB5DB4E6E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F71467DF-30C1-44A0-A15A-163CB5DB4E6E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Threading.Overlapped/ref/Configurations.props b/src/libraries/System.Threading.Overlapped/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Overlapped/ref/Configurations.props
+++ b/src/libraries/System.Threading.Overlapped/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj b/src/libraries/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj
index b69ec76..4075738 100644 (file)
--- a/src/libraries/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj
+++ b/src/libraries/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading.Overlapped/src/Configurations.props b/src/libraries/System.Threading.Overlapped/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Threading.Overlapped/src/Configurations.props
+++ b/src/libraries/System.Threading.Overlapped/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj b/src/libraries/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj
index bce456b..139c769 100644 (file)
--- a/src/libraries/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj
+++ b/src/libraries/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Threading.Overlapped</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Threading.Overlapped/tests/Configurations.props b/src/libraries/System.Threading.Overlapped/tests/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Threading.Overlapped/tests/Configurations.props
+++ b/src/libraries/System.Threading.Overlapped/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj b/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj
index 3806a2b..8d51b5f 100644 (file)
--- a/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj
+++ b/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln b/src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln
index 49fd218..3a8c3b5 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln
+++ b/src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln
@@ -26,10 +26,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A7AA2FC3-855F-44BA-8735-AB2F43D118A5}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A7AA2FC3-855F-44BA-8735-AB2F43D118A5}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A7AA2FC3-855F-44BA-8735-AB2F43D118A5}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A7AA2FC3-855F-44BA-8735-AB2F43D118A5}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {A7AA2FC3-855F-44BA-8735-AB2F43D118A5}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A7AA2FC3-855F-44BA-8735-AB2F43D118A5}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A7AA2FC3-855F-44BA-8735-AB2F43D118A5}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A7AA2FC3-855F-44BA-8735-AB2F43D118A5}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
                {2E2F7224-7C72-4A81-9625-A5241F8D836D}.Debug|Any CPU.ActiveCfg = netstandard2.0-Debug|Any CPU
                {2E2F7224-7C72-4A81-9625-A5241F8D836D}.Debug|Any CPU.Build.0 = netstandard2.0-Debug|Any CPU
                {2E2F7224-7C72-4A81-9625-A5241F8D836D}.Release|Any CPU.ActiveCfg = netstandard2.0-Release|Any CPU

diff --git a/src/libraries/System.Threading.Tasks.Dataflow/tests/Configurations.props b/src/libraries/System.Threading.Tasks.Dataflow/tests/Configurations.props
index 2e0339e..3e0106d 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Dataflow/tests/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Dataflow/tests/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      netfx;
+      $(NetCoreAppCurrent);
+      $(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj b/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj
index 655c8c1..f74aba7 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj
+++ b/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetFrameworkCurrent)-Debug;$(NetFrameworkCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Dataflow\ActionBlockTests.cs" />

diff --git a/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln b/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln
index ded08fa..a8e0e23 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln
+++ b/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {275B161B-D525-48A0-B1DE-344273AB9A99}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {275B161B-D525-48A0-B1DE-344273AB9A99}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {275B161B-D525-48A0-B1DE-344273AB9A99}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {275B161B-D525-48A0-B1DE-344273AB9A99}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {DE90AD0B-649D-4062-B8D9-9658DE140532}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {DE90AD0B-649D-4062-B8D9-9658DE140532}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {DE90AD0B-649D-4062-B8D9-9658DE140532}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {DE90AD0B-649D-4062-B8D9-9658DE140532}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {275B161B-D525-48A0-B1DE-344273AB9A99}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {275B161B-D525-48A0-B1DE-344273AB9A99}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {275B161B-D525-48A0-B1DE-344273AB9A99}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {275B161B-D525-48A0-B1DE-344273AB9A99}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {DE90AD0B-649D-4062-B8D9-9658DE140532}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {DE90AD0B-649D-4062-B8D9-9658DE140532}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {DE90AD0B-649D-4062-B8D9-9658DE140532}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {DE90AD0B-649D-4062-B8D9-9658DE140532}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Threading.Tasks.Extensions/ref/Configurations.props b/src/libraries/System.Threading.Tasks.Extensions/ref/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Extensions/ref/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Extensions/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Threading.Tasks.Extensions/ref/System.Threading.Tasks.Extensions.csproj b/src/libraries/System.Threading.Tasks.Extensions/ref/System.Threading.Tasks.Extensions.csproj
index d362e1c..5ffd263 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Extensions/ref/System.Threading.Tasks.Extensions.csproj
+++ b/src/libraries/System.Threading.Tasks.Extensions/ref/System.Threading.Tasks.Extensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Threading.Tasks.Extensions.Forwards.cs" />

diff --git a/src/libraries/System.Threading.Tasks.Extensions/src/Configurations.props b/src/libraries/System.Threading.Tasks.Extensions/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Extensions/src/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Extensions/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj b/src/libraries/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
index d113465..0ab31db 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
+++ b/src/libraries/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/Configurations.props b/src/libraries/System.Threading.Tasks.Extensions/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Extensions/tests/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Extensions/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj b/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj
index 674e64e..08fe1bc 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj
+++ b/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln b/src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln
index 64b8f4f..be906bc 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln
+++ b/src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Threading.Tasks.Parallel/ref/Configurations.props b/src/libraries/System.Threading.Tasks.Parallel/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Parallel/ref/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Parallel/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj b/src/libraries/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj
index 0034493..b216683 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj
+++ b/src/libraries/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading.Tasks.Parallel/src/Configurations.props b/src/libraries/System.Threading.Tasks.Parallel/src/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Parallel/src/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Parallel/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj b/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj
index 0993c7b..6234d63 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj
+++ b/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj
@@ -5,7 +5,7 @@
     <FileAlignment>512</FileAlignment>
     <DefineConstants>$(DefineConstants);CONCURRENT_COLLECTIONS;FEATURE_TRACING</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading.Tasks.Parallel/tests/Configurations.props b/src/libraries/System.Threading.Tasks.Parallel/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Parallel/tests/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Parallel/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj b/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj
index d5db67f..27e4a40 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj
+++ b/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />

diff --git a/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln b/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln
index 868b6f2..aab86bf 100644 (file)
--- a/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln
+++ b/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {B6C09633-D161-499A-8FE1-46B2D53A16E7}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {B6C09633-D161-499A-8FE1-46B2D53A16E7}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {B6C09633-D161-499A-8FE1-46B2D53A16E7}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {B6C09633-D161-499A-8FE1-46B2D53A16E7}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {B6C09633-D161-499A-8FE1-46B2D53A16E7}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {B6C09633-D161-499A-8FE1-46B2D53A16E7}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {B6C09633-D161-499A-8FE1-46B2D53A16E7}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {B6C09633-D161-499A-8FE1-46B2D53A16E7}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Threading.Tasks/ref/Configurations.props b/src/libraries/System.Threading.Tasks/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Tasks/ref/Configurations.props
+++ b/src/libraries/System.Threading.Tasks/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Tasks/ref/System.Threading.Tasks.csproj b/src/libraries/System.Threading.Tasks/ref/System.Threading.Tasks.csproj
index 30b0cd8..b413a7f 100644 (file)
--- a/src/libraries/System.Threading.Tasks/ref/System.Threading.Tasks.csproj
+++ b/src/libraries/System.Threading.Tasks/ref/System.Threading.Tasks.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading.Tasks/src/Configurations.props b/src/libraries/System.Threading.Tasks/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Threading.Tasks/src/Configurations.props
+++ b/src/libraries/System.Threading.Tasks/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj b/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj
index cfb0a60..b6060c8 100644 (file)
--- a/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj
+++ b/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Threading.Tasks</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Threading.Tasks/tests/Configurations.props b/src/libraries/System.Threading.Tasks/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Tasks/tests/Configurations.props
+++ b/src/libraries/System.Threading.Tasks/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
index 4d8afe1..6271ad8 100644 (file)
--- a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
+++ b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Helpers.cs" />

diff --git a/src/libraries/System.Threading.Thread/System.Threading.Thread.sln b/src/libraries/System.Threading.Thread/System.Threading.Thread.sln
index 26b54f1..b833c69 100644 (file)
--- a/src/libraries/System.Threading.Thread/System.Threading.Thread.sln
+++ b/src/libraries/System.Threading.Thread/System.Threading.Thread.sln
@@ -41,30 +41,30 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {32432E07-5CA4-41F3-9855-22AB1F1E69B3}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {32432E07-5CA4-41F3-9855-22AB1F1E69B3}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {32432E07-5CA4-41F3-9855-22AB1F1E69B3}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {32432E07-5CA4-41F3-9855-22AB1F1E69B3}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {8045E634-C181-4C6C-AE48-71AC18D1C637}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {8045E634-C181-4C6C-AE48-71AC18D1C637}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {8045E634-C181-4C6C-AE48-71AC18D1C637}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {8045E634-C181-4C6C-AE48-71AC18D1C637}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {06197EED-FF48-43F3-976D-463839D43E8C}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {06197EED-FF48-43F3-976D-463839D43E8C}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {06197EED-FF48-43F3-976D-463839D43E8C}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {06197EED-FF48-43F3-976D-463839D43E8C}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {82D06A2D-008D-4A4A-A83D-FB7F04721C87}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {82D06A2D-008D-4A4A-A83D-FB7F04721C87}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {82D06A2D-008D-4A4A-A83D-FB7F04721C87}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {82D06A2D-008D-4A4A-A83D-FB7F04721C87}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {32432E07-5CA4-41F3-9855-22AB1F1E69B3}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {32432E07-5CA4-41F3-9855-22AB1F1E69B3}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {32432E07-5CA4-41F3-9855-22AB1F1E69B3}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {32432E07-5CA4-41F3-9855-22AB1F1E69B3}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {8045E634-C181-4C6C-AE48-71AC18D1C637}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {8045E634-C181-4C6C-AE48-71AC18D1C637}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {8045E634-C181-4C6C-AE48-71AC18D1C637}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {8045E634-C181-4C6C-AE48-71AC18D1C637}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {06197EED-FF48-43F3-976D-463839D43E8C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {06197EED-FF48-43F3-976D-463839D43E8C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {06197EED-FF48-43F3-976D-463839D43E8C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {06197EED-FF48-43F3-976D-463839D43E8C}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {82D06A2D-008D-4A4A-A83D-FB7F04721C87}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {82D06A2D-008D-4A4A-A83D-FB7F04721C87}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {82D06A2D-008D-4A4A-A83D-FB7F04721C87}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {82D06A2D-008D-4A4A-A83D-FB7F04721C87}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Threading.Thread/ref/Configurations.props b/src/libraries/System.Threading.Thread/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Thread/ref/Configurations.props
+++ b/src/libraries/System.Threading.Thread/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj b/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj
index 78e6e3c..a0c7a29 100644 (file)
--- a/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj
+++ b/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading.Thread/src/Configurations.props b/src/libraries/System.Threading.Thread/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Threading.Thread/src/Configurations.props
+++ b/src/libraries/System.Threading.Thread/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj b/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj
index 00098fa..f61d5ad 100644 (file)
--- a/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj
+++ b/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj
@@ -4,7 +4,7 @@
     <OutputType>Library</OutputType>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Threading\ThreadExceptionEventArgs.cs" />

diff --git a/src/libraries/System.Threading.Thread/tests/Configurations.props b/src/libraries/System.Threading.Thread/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Thread/tests/Configurations.props
+++ b/src/libraries/System.Threading.Thread/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/Configurations.props b/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/Configurations.props
+++ b/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/DefaultApartmentStateMain.csproj b/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/DefaultApartmentStateMain.csproj
index fde6e1a..734d237 100644 (file)
--- a/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/DefaultApartmentStateMain.csproj
+++ b/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/DefaultApartmentStateMain.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <!-- To be consistent between netfx and others we override the SDK behavior which defaults to .dll -->
+    <!-- To be consistent between net472 and others we override the SDK behavior which defaults to .dll -->
     <TargetExt>.exe</TargetExt>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DefaultApartmentStateMain.cs" />

diff --git a/src/libraries/System.Threading.Thread/tests/MTAMain/Configurations.props b/src/libraries/System.Threading.Thread/tests/MTAMain/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Thread/tests/MTAMain/Configurations.props
+++ b/src/libraries/System.Threading.Thread/tests/MTAMain/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Thread/tests/MTAMain/MTAMain.csproj b/src/libraries/System.Threading.Thread/tests/MTAMain/MTAMain.csproj
index 836d458..fde5ced 100644 (file)
--- a/src/libraries/System.Threading.Thread/tests/MTAMain/MTAMain.csproj
+++ b/src/libraries/System.Threading.Thread/tests/MTAMain/MTAMain.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <!-- To be consistent between netfx and others we override the SDK behavior which defaults to .dll -->
+    <!-- To be consistent between net472 and others we override the SDK behavior which defaults to .dll -->
     <TargetExt>.exe</TargetExt>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="MTAMain.cs" />

diff --git a/src/libraries/System.Threading.Thread/tests/STAMain/Configurations.props b/src/libraries/System.Threading.Thread/tests/STAMain/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Thread/tests/STAMain/Configurations.props
+++ b/src/libraries/System.Threading.Thread/tests/STAMain/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Thread/tests/STAMain/STAMain.csproj b/src/libraries/System.Threading.Thread/tests/STAMain/STAMain.csproj
index 21c14ea..6eea9d6 100644 (file)
--- a/src/libraries/System.Threading.Thread/tests/STAMain/STAMain.csproj
+++ b/src/libraries/System.Threading.Thread/tests/STAMain/STAMain.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <!-- To be consistent between netfx and others we override the SDK behavior which defaults to .dll -->
+    <!-- To be consistent between net472 and others we override the SDK behavior which defaults to .dll -->
     <TargetExt>.exe</TargetExt>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="STAMain.cs" />

diff --git a/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj b/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj
index 3e2c026..ba544c7 100644 (file)
--- a/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj
+++ b/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CompressedStackTests.cs" />

diff --git a/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln b/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
index 9181e19..bd39a04 100644 (file)
--- a/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
+++ b/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {403AD1B8-6F95-4A2E-92A2-727606ABD866}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {403AD1B8-6F95-4A2E-92A2-727606ABD866}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {403AD1B8-6F95-4A2E-92A2-727606ABD866}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {403AD1B8-6F95-4A2E-92A2-727606ABD866}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {EE797598-BA64-4150-A3AA-8FB97DA63697}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {EE797598-BA64-4150-A3AA-8FB97DA63697}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {EE797598-BA64-4150-A3AA-8FB97DA63697}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {EE797598-BA64-4150-A3AA-8FB97DA63697}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {403AD1B8-6F95-4A2E-92A2-727606ABD866}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {403AD1B8-6F95-4A2E-92A2-727606ABD866}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {403AD1B8-6F95-4A2E-92A2-727606ABD866}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {403AD1B8-6F95-4A2E-92A2-727606ABD866}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {EE797598-BA64-4150-A3AA-8FB97DA63697}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {EE797598-BA64-4150-A3AA-8FB97DA63697}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {EE797598-BA64-4150-A3AA-8FB97DA63697}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {EE797598-BA64-4150-A3AA-8FB97DA63697}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Threading.ThreadPool/ref/Configurations.props b/src/libraries/System.Threading.ThreadPool/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.ThreadPool/ref/Configurations.props
+++ b/src/libraries/System.Threading.ThreadPool/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj b/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj
index fef1c45..d00605c 100644 (file)
--- a/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj
+++ b/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading.ThreadPool/src/Configurations.props b/src/libraries/System.Threading.ThreadPool/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Threading.ThreadPool/src/Configurations.props
+++ b/src/libraries/System.Threading.ThreadPool/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj b/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj
index 6aafb29..07d8de0 100644 (file)
--- a/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj
+++ b/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Threading.ThreadPool</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Threading.ThreadPool/tests/Configurations.props b/src/libraries/System.Threading.ThreadPool/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.ThreadPool/tests/Configurations.props
+++ b/src/libraries/System.Threading.ThreadPool/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj b/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj
index 3b494e7..1ee11af 100644 (file)
--- a/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj
+++ b/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading.Timer/System.Threading.Timer.sln b/src/libraries/System.Threading.Timer/System.Threading.Timer.sln
index ba97f37..bf36930 100644 (file)
--- a/src/libraries/System.Threading.Timer/System.Threading.Timer.sln
+++ b/src/libraries/System.Threading.Timer/System.Threading.Timer.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {ac20a28f-fda8-45e8-8728-058ead16e44c}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {ac20a28f-fda8-45e8-8728-058ead16e44c}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {ac20a28f-fda8-45e8-8728-058ead16e44c}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {ac20a28f-fda8-45e8-8728-058ead16e44c}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {DC78B562-4F74-49C2-9766-3B65CD610CCC}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {DC78B562-4F74-49C2-9766-3B65CD610CCC}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {DC78B562-4F74-49C2-9766-3B65CD610CCC}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {DC78B562-4F74-49C2-9766-3B65CD610CCC}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {ac20a28f-fda8-45e8-8728-058ead16e44c}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {ac20a28f-fda8-45e8-8728-058ead16e44c}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {ac20a28f-fda8-45e8-8728-058ead16e44c}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {ac20a28f-fda8-45e8-8728-058ead16e44c}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {DC78B562-4F74-49C2-9766-3B65CD610CCC}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {DC78B562-4F74-49C2-9766-3B65CD610CCC}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {DC78B562-4F74-49C2-9766-3B65CD610CCC}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {DC78B562-4F74-49C2-9766-3B65CD610CCC}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Threading.Timer/ref/Configurations.props b/src/libraries/System.Threading.Timer/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Timer/ref/Configurations.props
+++ b/src/libraries/System.Threading.Timer/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Timer/ref/System.Threading.Timer.csproj b/src/libraries/System.Threading.Timer/ref/System.Threading.Timer.csproj
index be71a21..3e58639 100644 (file)
--- a/src/libraries/System.Threading.Timer/ref/System.Threading.Timer.csproj
+++ b/src/libraries/System.Threading.Timer/ref/System.Threading.Timer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading.Timer/src/Configurations.props b/src/libraries/System.Threading.Timer/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Threading.Timer/src/Configurations.props
+++ b/src/libraries/System.Threading.Timer/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Threading.Timer/src/System.Threading.Timer.csproj b/src/libraries/System.Threading.Timer/src/System.Threading.Timer.csproj
index 8d4d52e..79e59ff 100644 (file)
--- a/src/libraries/System.Threading.Timer/src/System.Threading.Timer.csproj
+++ b/src/libraries/System.Threading.Timer/src/System.Threading.Timer.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Threading.Timer</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/libraries/System.Threading.Timer/tests/Configurations.props b/src/libraries/System.Threading.Timer/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading.Timer/tests/Configurations.props
+++ b/src/libraries/System.Threading.Timer/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj b/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
index 58b8a9c..96eb84d 100644 (file)
--- a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
+++ b/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
   </PropertyGroup>

diff --git a/src/libraries/System.Threading/System.Threading.sln b/src/libraries/System.Threading/System.Threading.sln
index 8dd0c96..a3827f8 100644 (file)
--- a/src/libraries/System.Threading/System.Threading.sln
+++ b/src/libraries/System.Threading/System.Threading.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {18EF66B3-51EE-46D8-B283-1CB6A1197813}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {18EF66B3-51EE-46D8-B283-1CB6A1197813}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {18EF66B3-51EE-46D8-B283-1CB6A1197813}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {18EF66B3-51EE-46D8-B283-1CB6A1197813}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {604027F5-1DFC-42F4-B4FE-61F8789BA647}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {604027F5-1DFC-42F4-B4FE-61F8789BA647}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {604027F5-1DFC-42F4-B4FE-61F8789BA647}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {604027F5-1DFC-42F4-B4FE-61F8789BA647}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F59F13CA-829A-4D02-9A1D-E40E61257177}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F59F13CA-829A-4D02-9A1D-E40E61257177}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F59F13CA-829A-4D02-9A1D-E40E61257177}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F59F13CA-829A-4D02-9A1D-E40E61257177}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {18EF66B3-51EE-46D8-B283-1CB6A1197813}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {18EF66B3-51EE-46D8-B283-1CB6A1197813}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {18EF66B3-51EE-46D8-B283-1CB6A1197813}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {18EF66B3-51EE-46D8-B283-1CB6A1197813}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {604027F5-1DFC-42F4-B4FE-61F8789BA647}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {604027F5-1DFC-42F4-B4FE-61F8789BA647}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {604027F5-1DFC-42F4-B4FE-61F8789BA647}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {604027F5-1DFC-42F4-B4FE-61F8789BA647}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F59F13CA-829A-4D02-9A1D-E40E61257177}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F59F13CA-829A-4D02-9A1D-E40E61257177}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F59F13CA-829A-4D02-9A1D-E40E61257177}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F59F13CA-829A-4D02-9A1D-E40E61257177}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Threading/ref/Configurations.props b/src/libraries/System.Threading/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading/ref/Configurations.props
+++ b/src/libraries/System.Threading/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading/ref/System.Threading.csproj b/src/libraries/System.Threading/ref/System.Threading.csproj
index 1706ea2..ffd91ff 100644 (file)
--- a/src/libraries/System.Threading/ref/System.Threading.csproj
+++ b/src/libraries/System.Threading/ref/System.Threading.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading/src/Configurations.props b/src/libraries/System.Threading/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Threading/src/Configurations.props
+++ b/src/libraries/System.Threading/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Threading/src/System.Threading.csproj b/src/libraries/System.Threading/src/System.Threading.csproj
index 703be32..9d84207 100644 (file)
--- a/src/libraries/System.Threading/src/System.Threading.csproj
+++ b/src/libraries/System.Threading/src/System.Threading.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Threading</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Threading/tests/Configurations.props b/src/libraries/System.Threading/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Threading/tests/Configurations.props
+++ b/src/libraries/System.Threading/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Threading/tests/System.Threading.Tests.csproj b/src/libraries/System.Threading/tests/System.Threading.Tests.csproj
index 7d9e182..51cd229 100644 (file)
--- a/src/libraries/System.Threading/tests/System.Threading.Tests.csproj
+++ b/src/libraries/System.Threading/tests/System.Threading.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AsyncLocalTests.cs" />

diff --git a/src/libraries/System.Transactions.Local/System.Transactions.Local.sln b/src/libraries/System.Transactions.Local/System.Transactions.Local.sln
index dccf033..c7bdae7 100644 (file)
--- a/src/libraries/System.Transactions.Local/System.Transactions.Local.sln
+++ b/src/libraries/System.Transactions.Local/System.Transactions.Local.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {1C397868-9644-48CB-94BF-35805C4AE024}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {1C397868-9644-48CB-94BF-35805C4AE024}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {1C397868-9644-48CB-94BF-35805C4AE024}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {1C397868-9644-48CB-94BF-35805C4AE024}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {E97557E3-7DB1-4828-ACA5-44D8C68B6698}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {E97557E3-7DB1-4828-ACA5-44D8C68B6698}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {E97557E3-7DB1-4828-ACA5-44D8C68B6698}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {E97557E3-7DB1-4828-ACA5-44D8C68B6698}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {1C397868-9644-48CB-94BF-35805C4AE024}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {1C397868-9644-48CB-94BF-35805C4AE024}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {1C397868-9644-48CB-94BF-35805C4AE024}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {1C397868-9644-48CB-94BF-35805C4AE024}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {E97557E3-7DB1-4828-ACA5-44D8C68B6698}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {E97557E3-7DB1-4828-ACA5-44D8C68B6698}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {E97557E3-7DB1-4828-ACA5-44D8C68B6698}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {E97557E3-7DB1-4828-ACA5-44D8C68B6698}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Transactions.Local/ref/Configurations.props b/src/libraries/System.Transactions.Local/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Transactions.Local/ref/Configurations.props
+++ b/src/libraries/System.Transactions.Local/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Transactions.Local/ref/System.Transactions.Local.csproj b/src/libraries/System.Transactions.Local/ref/System.Transactions.Local.csproj
index 5de24ad..8d14826 100644 (file)
--- a/src/libraries/System.Transactions.Local/ref/System.Transactions.Local.csproj
+++ b/src/libraries/System.Transactions.Local/ref/System.Transactions.Local.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Transactions.Local/src/Configurations.props b/src/libraries/System.Transactions.Local/src/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Transactions.Local/src/Configurations.props
+++ b/src/libraries/System.Transactions.Local/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj b/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj
index 6f8fdc1..f7e2bc1 100644 (file)
--- a/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj
+++ b/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->

diff --git a/src/libraries/System.Transactions.Local/tests/Configurations.props b/src/libraries/System.Transactions.Local/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Transactions.Local/tests/Configurations.props
+++ b/src/libraries/System.Transactions.Local/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj b/src/libraries/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj
index 52f38a3..dd0126b 100644 (file)
--- a/src/libraries/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj
+++ b/src/libraries/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <CoverageSupported>false</CoverageSupported>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NonMsdtcPromoterTests.cs" />

diff --git a/src/libraries/System.Utf8String.Experimental/System.Utf8String.Experimental.sln b/src/libraries/System.Utf8String.Experimental/System.Utf8String.Experimental.sln
index a505334..971b1b5 100644 (file)
--- a/src/libraries/System.Utf8String.Experimental/System.Utf8String.Experimental.sln
+++ b/src/libraries/System.Utf8String.Experimental/System.Utf8String.Experimental.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {72E9FB32-4692-4692-A10B-9F053F8F1A88}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {72E9FB32-4692-4692-A10B-9F053F8F1A88}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {72E9FB32-4692-4692-A10B-9F053F8F1A88}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {72E9FB32-4692-4692-A10B-9F053F8F1A88}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {D4266847-6692-481B-9459-6141DB7DA339}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {D4266847-6692-481B-9459-6141DB7DA339}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {D4266847-6692-481B-9459-6141DB7DA339}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {D4266847-6692-481B-9459-6141DB7DA339}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {7AF57E6B-2CED-45C9-8BCA-5BBA60D018E0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {7AF57E6B-2CED-45C9-8BCA-5BBA60D018E0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {7AF57E6B-2CED-45C9-8BCA-5BBA60D018E0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {7AF57E6B-2CED-45C9-8BCA-5BBA60D018E0}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {72E9FB32-4692-4692-A10B-9F053F8F1A88}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {72E9FB32-4692-4692-A10B-9F053F8F1A88}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {72E9FB32-4692-4692-A10B-9F053F8F1A88}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {72E9FB32-4692-4692-A10B-9F053F8F1A88}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {D4266847-6692-481B-9459-6141DB7DA339}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D4266847-6692-481B-9459-6141DB7DA339}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D4266847-6692-481B-9459-6141DB7DA339}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D4266847-6692-481B-9459-6141DB7DA339}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {7AF57E6B-2CED-45C9-8BCA-5BBA60D018E0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {7AF57E6B-2CED-45C9-8BCA-5BBA60D018E0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {7AF57E6B-2CED-45C9-8BCA-5BBA60D018E0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {7AF57E6B-2CED-45C9-8BCA-5BBA60D018E0}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Utf8String.Experimental/ref/Configurations.props b/src/libraries/System.Utf8String.Experimental/ref/Configurations.props
index d3ac8a6..30f4e07 100644 (file)
--- a/src/libraries/System.Utf8String.Experimental/ref/Configurations.props
+++ b/src/libraries/System.Utf8String.Experimental/ref/Configurations.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj
index dfb8a35..b0e3ee9 100644 (file)
--- a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj
+++ b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj
@@ -4,7 +4,7 @@
     <ProjectGuid>{7AF57E6B-2CED-45C9-8BCA-5BBA60D018E0}</ProjectGuid>
     <!-- disable warnings about obsolete APIs -->
     <NoWarn>$(NoWarn);0809;0618</NoWarn>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup Condition="'$(IsPrerelease)' != 'false'">

diff --git a/src/libraries/System.Utf8String.Experimental/src/Configurations.props b/src/libraries/System.Utf8String.Experimental/src/Configurations.props
index e75400d..51d6e90 100644 (file)
--- a/src/libraries/System.Utf8String.Experimental/src/Configurations.props
+++ b/src/libraries/System.Utf8String.Experimental/src/Configurations.props
@@ -2,8 +2,8 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj
index cf97030..264d83a 100644 (file)
--- a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj
+++ b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
     <RootNamespace>System</RootNamespace>
   </PropertyGroup>
   <ItemGroup Condition="'$(IsPrerelease)' != 'false'">

diff --git a/src/libraries/System.Utf8String.Experimental/tests/Configurations.props b/src/libraries/System.Utf8String.Experimental/tests/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Utf8String.Experimental/tests/Configurations.props
+++ b/src/libraries/System.Utf8String.Experimental/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj b/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj
index e21b2a3..e642752 100644 (file)
--- a/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj
+++ b/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludePartialFacadeTests>true</IncludePartialFacadeTests>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <RootNamespace>System</RootNamespace>

diff --git a/src/libraries/System.ValueTuple/System.ValueTuple.sln b/src/libraries/System.ValueTuple/System.ValueTuple.sln
index 104d520..97550d0 100644 (file)
--- a/src/libraries/System.ValueTuple/System.ValueTuple.sln
+++ b/src/libraries/System.ValueTuple/System.ValueTuple.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {CBD5AE8D-8595-48E2-848F-1A3492A28FDB}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {CBD5AE8D-8595-48E2-848F-1A3492A28FDB}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {CBD5AE8D-8595-48E2-848F-1A3492A28FDB}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {CBD5AE8D-8595-48E2-848F-1A3492A28FDB}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {11AE73F7-3532-47B9-8FF6-B4F22D76456D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {11AE73F7-3532-47B9-8FF6-B4F22D76456D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {11AE73F7-3532-47B9-8FF6-B4F22D76456D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {11AE73F7-3532-47B9-8FF6-B4F22D76456D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {CBD5AE8D-8595-48E2-848F-1A3492A28FDB}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {CBD5AE8D-8595-48E2-848F-1A3492A28FDB}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {CBD5AE8D-8595-48E2-848F-1A3492A28FDB}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {CBD5AE8D-8595-48E2-848F-1A3492A28FDB}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {11AE73F7-3532-47B9-8FF6-B4F22D76456D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {11AE73F7-3532-47B9-8FF6-B4F22D76456D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {11AE73F7-3532-47B9-8FF6-B4F22D76456D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {11AE73F7-3532-47B9-8FF6-B4F22D76456D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.ValueTuple/ref/Configurations.props b/src/libraries/System.ValueTuple/ref/Configurations.props
index 0cec8e8..8563450 100644 (file)
--- a/src/libraries/System.ValueTuple/ref/Configurations.props
+++ b/src/libraries/System.ValueTuple/ref/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      _netfx;
+      $(NetCoreAppCurrent);
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.ValueTuple/ref/System.ValueTuple.csproj b/src/libraries/System.ValueTuple/ref/System.ValueTuple.csproj
index 9c694e8..98e6707 100644 (file)
--- a/src/libraries/System.ValueTuple/ref/System.ValueTuple.csproj
+++ b/src/libraries/System.ValueTuple/ref/System.ValueTuple.csproj
@@ -3,7 +3,7 @@
     <!-- Must match version supported by frameworks which support 4.0.* inbox.
          Can be removed when API is added and this assembly is versioned to 4.1.* -->
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ValueTuple.TypeForwards.cs" />

diff --git a/src/libraries/System.ValueTuple/src/Configurations.props b/src/libraries/System.ValueTuple/src/Configurations.props
index 0cec8e8..8563450 100644 (file)
--- a/src/libraries/System.ValueTuple/src/Configurations.props
+++ b/src/libraries/System.ValueTuple/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
-      _netfx;
+      $(NetCoreAppCurrent);
+      _$(NetFrameworkCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.ValueTuple/src/System.ValueTuple.csproj b/src/libraries/System.ValueTuple/src/System.ValueTuple.csproj
index f642ec5..deda52d 100644 (file)
--- a/src/libraries/System.ValueTuple/src/System.ValueTuple.csproj
+++ b/src/libraries/System.ValueTuple/src/System.ValueTuple.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- rev'ed to 4.0.1.0 even though 4.0.0.0 never shipped so that we can drop pre-release down to beta -->
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Collections" />

diff --git a/src/libraries/System.ValueTuple/tests/Configurations.props b/src/libraries/System.ValueTuple/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.ValueTuple/tests/Configurations.props
+++ b/src/libraries/System.ValueTuple/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj b/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj
index a32940e..b0f4e7f 100644 (file)
--- a/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj
+++ b/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln b/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln
index c59100b..0d0a18a 100644 (file)
--- a/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln
+++ b/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {914279EE-58B1-4B27-BA18-66D988C8DFFA}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {914279EE-58B1-4B27-BA18-66D988C8DFFA}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {914279EE-58B1-4B27-BA18-66D988C8DFFA}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {914279EE-58B1-4B27-BA18-66D988C8DFFA}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {CE959FC9-5E04-4F29-96B5-454BF3E76306}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {CE959FC9-5E04-4F29-96B5-454BF3E76306}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {CE959FC9-5E04-4F29-96B5-454BF3E76306}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {CE959FC9-5E04-4F29-96B5-454BF3E76306}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-               {CB57F978-2BA8-4BF3-A755-A032030974A0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {CB57F978-2BA8-4BF3-A755-A032030974A0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {CB57F978-2BA8-4BF3-A755-A032030974A0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {CB57F978-2BA8-4BF3-A755-A032030974A0}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {914279EE-58B1-4B27-BA18-66D988C8DFFA}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {914279EE-58B1-4B27-BA18-66D988C8DFFA}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {914279EE-58B1-4B27-BA18-66D988C8DFFA}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {914279EE-58B1-4B27-BA18-66D988C8DFFA}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {CE959FC9-5E04-4F29-96B5-454BF3E76306}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {CE959FC9-5E04-4F29-96B5-454BF3E76306}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {CE959FC9-5E04-4F29-96B5-454BF3E76306}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {CE959FC9-5E04-4F29-96B5-454BF3E76306}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
+               {CB57F978-2BA8-4BF3-A755-A032030974A0}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {CB57F978-2BA8-4BF3-A755-A032030974A0}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {CB57F978-2BA8-4BF3-A755-A032030974A0}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {CB57F978-2BA8-4BF3-A755-A032030974A0}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Web.HttpUtility/ref/Configurations.props b/src/libraries/System.Web.HttpUtility/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Web.HttpUtility/ref/Configurations.props
+++ b/src/libraries/System.Web.HttpUtility/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj b/src/libraries/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj
index d7db5ef..47e5c80 100644 (file)
--- a/src/libraries/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj
+++ b/src/libraries/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Web.HttpUtility.cs" />

diff --git a/src/libraries/System.Web.HttpUtility/src/Configurations.props b/src/libraries/System.Web.HttpUtility/src/Configurations.props
index a1eadd7..d3947cd 100644 (file)
--- a/src/libraries/System.Web.HttpUtility/src/Configurations.props
+++ b/src/libraries/System.Web.HttpUtility/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj b/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj
index 3c92390..433eda4 100644 (file)
--- a/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj
+++ b/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">

diff --git a/src/libraries/System.Web.HttpUtility/tests/Configurations.props b/src/libraries/System.Web.HttpUtility/tests/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Web.HttpUtility/tests/Configurations.props
+++ b/src/libraries/System.Web.HttpUtility/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj b/src/libraries/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj
index fb3fe78..bd1c076 100644 (file)
--- a/src/libraries/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj
+++ b/src/libraries/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="HttpUtility\HttpUtilityTest.cs" />

diff --git a/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln b/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln
index 2154828..7037f84 100644 (file)
--- a/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln
+++ b/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln
@@ -26,18 +26,18 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {AC1A1515-70D8-42E4-9B19-A72F739E974C}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {AC1A1515-70D8-42E4-9B19-A72F739E974C}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {AC1A1515-70D8-42E4-9B19-A72F739E974C}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {AC1A1515-70D8-42E4-9B19-A72F739E974C}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {E0C4E267-B1D6-463B-9C95-8C0D3C335924}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {E0C4E267-B1D6-463B-9C95-8C0D3C335924}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {E0C4E267-B1D6-463B-9C95-8C0D3C335924}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {E0C4E267-B1D6-463B-9C95-8C0D3C335924}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {36A0298D-E01E-411D-A19B-19EEC60B9A8A}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {36A0298D-E01E-411D-A19B-19EEC60B9A8A}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {36A0298D-E01E-411D-A19B-19EEC60B9A8A}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {36A0298D-E01E-411D-A19B-19EEC60B9A8A}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {AC1A1515-70D8-42E4-9B19-A72F739E974C}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {AC1A1515-70D8-42E4-9B19-A72F739E974C}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {AC1A1515-70D8-42E4-9B19-A72F739E974C}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {AC1A1515-70D8-42E4-9B19-A72F739E974C}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {E0C4E267-B1D6-463B-9C95-8C0D3C335924}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {E0C4E267-B1D6-463B-9C95-8C0D3C335924}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {E0C4E267-B1D6-463B-9C95-8C0D3C335924}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {E0C4E267-B1D6-463B-9C95-8C0D3C335924}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {36A0298D-E01E-411D-A19B-19EEC60B9A8A}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {36A0298D-E01E-411D-A19B-19EEC60B9A8A}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {36A0298D-E01E-411D-A19B-19EEC60B9A8A}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {36A0298D-E01E-411D-A19B-19EEC60B9A8A}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Windows.Extensions/ref/Configurations.props b/src/libraries/System.Windows.Extensions/ref/Configurations.props
index c770647..6422650 100644 (file)
--- a/src/libraries/System.Windows.Extensions/ref/Configurations.props
+++ b/src/libraries/System.Windows.Extensions/ref/Configurations.props
@@ -5,7 +5,7 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj
index 8ed3c74..0b52217 100644 (file)
--- a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj
+++ b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Windows.Extensions.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)'">
     <ProjectReference Include="..\..\System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" />
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.ComponentModel.EventBasedAsync\ref\System.ComponentModel.EventBasedAsync.csproj" />

diff --git a/src/libraries/System.Windows.Extensions/src/Configurations.props b/src/libraries/System.Windows.Extensions/src/Configurations.props
index b540fc1..ff49cc1 100644 (file)
--- a/src/libraries/System.Windows.Extensions/src/Configurations.props
+++ b/src/libraries/System.Windows.Extensions/src/Configurations.props
@@ -6,8 +6,8 @@
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
-      netcoreapp-Windows_NT;
-      netcoreapp;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj
index 4231e6c..654a47c 100644 (file)
--- a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj
+++ b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_System_Windows_Extensions</GeneratePlatformNotSupportedAssemblyMessage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertAddCertificateLinkToStore.cs">

diff --git a/src/libraries/System.Windows.Extensions/tests/Configurations.props b/src/libraries/System.Windows.Extensions/tests/Configurations.props
index 9202405..f88c388 100644 (file)
--- a/src/libraries/System.Windows.Extensions/tests/Configurations.props
+++ b/src/libraries/System.Windows.Extensions/tests/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
+      $(NetCoreAppCurrent)-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj b/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj
index 4d96364..848c12a 100644 (file)
--- a/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj
+++ b/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="X509Certificate2UITests.cs" />

diff --git a/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln b/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
index 1e41c92..8b44833 100644 (file)
--- a/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
+++ b/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
@@ -19,14 +19,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {C559743A-762E-4D9D-B986-E77BDB97652E}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {C559743A-762E-4D9D-B986-E77BDB97652E}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {C559743A-762E-4D9D-B986-E77BDB97652E}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {C559743A-762E-4D9D-B986-E77BDB97652E}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {6F785D18-A969-4DB9-AB45-DD294839087D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {6F785D18-A969-4DB9-AB45-DD294839087D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {6F785D18-A969-4DB9-AB45-DD294839087D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {6F785D18-A969-4DB9-AB45-DD294839087D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {C559743A-762E-4D9D-B986-E77BDB97652E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {C559743A-762E-4D9D-B986-E77BDB97652E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {C559743A-762E-4D9D-B986-E77BDB97652E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {C559743A-762E-4D9D-B986-E77BDB97652E}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {6F785D18-A969-4DB9-AB45-DD294839087D}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {6F785D18-A969-4DB9-AB45-DD294839087D}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {6F785D18-A969-4DB9-AB45-DD294839087D}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {6F785D18-A969-4DB9-AB45-DD294839087D}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Xml.ReaderWriter/ref/Configurations.props b/src/libraries/System.Xml.ReaderWriter/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Xml.ReaderWriter/ref/Configurations.props
+++ b/src/libraries/System.Xml.ReaderWriter/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj b/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj
index a8e6877..c48991e 100644 (file)
--- a/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj
+++ b/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.ReaderWriter.cs" />

diff --git a/src/libraries/System.Xml.ReaderWriter/src/Configurations.props b/src/libraries/System.Xml.ReaderWriter/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Xml.ReaderWriter/src/Configurations.props
+++ b/src/libraries/System.Xml.ReaderWriter/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj b/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj
index 34a5535..415f62a 100644 (file)
--- a/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj
+++ b/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Xml.ReaderWriter</AssemblyName>
     <RootNamespace>System.Xml</RootNamespace>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" />

diff --git a/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln b/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln
index 90a1d6c..a23dcb8 100644 (file)
--- a/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln
+++ b/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln
@@ -19,14 +19,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {442C5A88-29C2-4B00-B1DF-730D646D3861}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {442C5A88-29C2-4B00-B1DF-730D646D3861}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {442C5A88-29C2-4B00-B1DF-730D646D3861}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {442C5A88-29C2-4B00-B1DF-730D646D3861}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {442C5A88-29C2-4B00-B1DF-730D646D3861}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {442C5A88-29C2-4B00-B1DF-730D646D3861}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {442C5A88-29C2-4B00-B1DF-730D646D3861}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {442C5A88-29C2-4B00-B1DF-730D646D3861}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Xml.XDocument/ref/Configurations.props b/src/libraries/System.Xml.XDocument/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Xml.XDocument/ref/Configurations.props
+++ b/src/libraries/System.Xml.XDocument/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj b/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj
index f3b24cd..f53a518 100644 (file)
--- a/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj
+++ b/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.XDocument.cs" />

diff --git a/src/libraries/System.Xml.XDocument/src/Configurations.props b/src/libraries/System.Xml.XDocument/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Xml.XDocument/src/Configurations.props
+++ b/src/libraries/System.Xml.XDocument/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj b/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj
index ea77a26..4df5c8c 100644 (file)
--- a/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj
+++ b/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Xml.XDocument</AssemblyName>
     <RootNamespace>System.Xml</RootNamespace>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj" />

diff --git a/src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln b/src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln
index d2cc420..0cc04ce 100644 (file)
--- a/src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln
+++ b/src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln
@@ -19,14 +19,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Xml.XPath.XDocument/ref/Configurations.props b/src/libraries/System.Xml.XPath.XDocument/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Xml.XPath.XDocument/ref/Configurations.props
+++ b/src/libraries/System.Xml.XPath.XDocument/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj b/src/libraries/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj
index 5ec5620..3ebe4f6 100644 (file)
--- a/src/libraries/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj
+++ b/src/libraries/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.XPath.XDocument.cs" />

diff --git a/src/libraries/System.Xml.XPath.XDocument/src/Configurations.props b/src/libraries/System.Xml.XPath.XDocument/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Xml.XPath.XDocument/src/Configurations.props
+++ b/src/libraries/System.Xml.XPath.XDocument/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj b/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj
index 971bbaa..c14d21b 100644 (file)
--- a/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj
+++ b/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Xml.XPath.XDocument</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Xml\XPath\XDocumentExtensions.cs" />

diff --git a/src/libraries/System.Xml.XPath/System.Xml.XPath.sln b/src/libraries/System.Xml.XPath/System.Xml.XPath.sln
index ed2ffa1..753c945 100644 (file)
--- a/src/libraries/System.Xml.XPath/System.Xml.XPath.sln
+++ b/src/libraries/System.Xml.XPath/System.Xml.XPath.sln
@@ -19,14 +19,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {783F801D-50DE-45B1-B8BE-C36A1F5049F1}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {783F801D-50DE-45B1-B8BE-C36A1F5049F1}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {783F801D-50DE-45B1-B8BE-C36A1F5049F1}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {783F801D-50DE-45B1-B8BE-C36A1F5049F1}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {A3B3FF23-D123-4F5A-8618-5128B18987C5}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {A3B3FF23-D123-4F5A-8618-5128B18987C5}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {A3B3FF23-D123-4F5A-8618-5128B18987C5}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {A3B3FF23-D123-4F5A-8618-5128B18987C5}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {783F801D-50DE-45B1-B8BE-C36A1F5049F1}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {783F801D-50DE-45B1-B8BE-C36A1F5049F1}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {783F801D-50DE-45B1-B8BE-C36A1F5049F1}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {783F801D-50DE-45B1-B8BE-C36A1F5049F1}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {A3B3FF23-D123-4F5A-8618-5128B18987C5}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {A3B3FF23-D123-4F5A-8618-5128B18987C5}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {A3B3FF23-D123-4F5A-8618-5128B18987C5}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {A3B3FF23-D123-4F5A-8618-5128B18987C5}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Xml.XPath/ref/Configurations.props b/src/libraries/System.Xml.XPath/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Xml.XPath/ref/Configurations.props
+++ b/src/libraries/System.Xml.XPath/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Xml.XPath/ref/System.Xml.XPath.csproj b/src/libraries/System.Xml.XPath/ref/System.Xml.XPath.csproj
index 7e73225..f64892f 100644 (file)
--- a/src/libraries/System.Xml.XPath/ref/System.Xml.XPath.csproj
+++ b/src/libraries/System.Xml.XPath/ref/System.Xml.XPath.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.XPath.cs" />

diff --git a/src/libraries/System.Xml.XPath/src/Configurations.props b/src/libraries/System.Xml.XPath/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Xml.XPath/src/Configurations.props
+++ b/src/libraries/System.Xml.XPath/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj b/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj
index dfbccce..316e947 100644 (file)
--- a/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj
+++ b/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>System.Xml.XPath</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" />

diff --git a/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln b/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln
index b2af142..8581ab0 100644 (file)
--- a/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln
+++ b/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln
@@ -19,14 +19,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {EC0F9F33-3D4E-470A-90E6-AE9D005F023A}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {EC0F9F33-3D4E-470A-90E6-AE9D005F023A}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {EC0F9F33-3D4E-470A-90E6-AE9D005F023A}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {EC0F9F33-3D4E-470A-90E6-AE9D005F023A}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {EC0F9F33-3D4E-470A-90E6-AE9D005F023A}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {EC0F9F33-3D4E-470A-90E6-AE9D005F023A}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {EC0F9F33-3D4E-470A-90E6-AE9D005F023A}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {EC0F9F33-3D4E-470A-90E6-AE9D005F023A}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Xml.XmlDocument/ref/Configurations.props b/src/libraries/System.Xml.XmlDocument/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Xml.XmlDocument/ref/Configurations.props
+++ b/src/libraries/System.Xml.XmlDocument/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj b/src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj
index a6a86c8..3b48070 100644 (file)
--- a/src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj
+++ b/src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.XmlDocument.cs" />

diff --git a/src/libraries/System.Xml.XmlDocument/src/Configurations.props b/src/libraries/System.Xml.XmlDocument/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Xml.XmlDocument/src/Configurations.props
+++ b/src/libraries/System.Xml.XmlDocument/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj b/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj
index 4950e31..da02d2a 100644 (file)
--- a/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj
+++ b/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>System.Xml.XmlDocument</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" />

diff --git a/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln b/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
index ee7a7ac..fbdd08e 100644 (file)
--- a/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
+++ b/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
@@ -19,14 +19,14 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {D62A6082-5229-4845-8BE9-75753E08C65A}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
-               {D62A6082-5229-4845-8BE9-75753E08C65A}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
-               {D62A6082-5229-4845-8BE9-75753E08C65A}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
-               {D62A6082-5229-4845-8BE9-75753E08C65A}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
-               {3F7C5D50-7CDA-44EF-BB05-912D496BAA46}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-               {3F7C5D50-7CDA-44EF-BB05-912D496BAA46}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-               {3F7C5D50-7CDA-44EF-BB05-912D496BAA46}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-               {3F7C5D50-7CDA-44EF-BB05-912D496BAA46}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+               {D62A6082-5229-4845-8BE9-75753E08C65A}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D62A6082-5229-4845-8BE9-75753E08C65A}.Debug|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Debug|Any CPU
+               {D62A6082-5229-4845-8BE9-75753E08C65A}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {D62A6082-5229-4845-8BE9-75753E08C65A}.Release|Any CPU.Build.0 = netcoreapp5.0-Windows_NT-Release|Any CPU
+               {3F7C5D50-7CDA-44EF-BB05-912D496BAA46}.Debug|Any CPU.ActiveCfg = netcoreapp5.0-Debug|Any CPU
+               {3F7C5D50-7CDA-44EF-BB05-912D496BAA46}.Debug|Any CPU.Build.0 = netcoreapp5.0-Debug|Any CPU
+               {3F7C5D50-7CDA-44EF-BB05-912D496BAA46}.Release|Any CPU.ActiveCfg = netcoreapp5.0-Release|Any CPU
+               {3F7C5D50-7CDA-44EF-BB05-912D496BAA46}.Release|Any CPU.Build.0 = netcoreapp5.0-Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/src/libraries/System.Xml.XmlSerializer/ref/Configurations.props b/src/libraries/System.Xml.XmlSerializer/ref/Configurations.props
index 89d6ac0..b6e0d3c 100644 (file)
--- a/src/libraries/System.Xml.XmlSerializer/ref/Configurations.props
+++ b/src/libraries/System.Xml.XmlSerializer/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj b/src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj
index 1bc1a27..5c0c924 100644 (file)
--- a/src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj
+++ b/src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.XmlSerializer.cs" />

diff --git a/src/libraries/System.Xml.XmlSerializer/src/Configurations.props b/src/libraries/System.Xml.XmlSerializer/src/Configurations.props
index adabcc0..c10c0d2 100644 (file)
--- a/src/libraries/System.Xml.XmlSerializer/src/Configurations.props
+++ b/src/libraries/System.Xml.XmlSerializer/src/Configurations.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj b/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj
index 6ecbaad..150baa6 100644 (file)
--- a/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj
+++ b/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>System.Xml.XmlSerializer</AssemblyName>
     <RootNamespace>System.Xml.XmlSerializer</RootNamespace>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Unix-Debug;$(NetCoreAppCurrent)-Unix-Release;$(NetCoreAppCurrent)-Windows_NT-Debug;$(NetCoreAppCurrent)-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" />

diff --git a/src/libraries/mscorlib.WinRT-Facade/ref/Configurations.props b/src/libraries/mscorlib.WinRT-Facade/ref/Configurations.props
index 7ad541b..06c4db0 100644 (file)
--- a/src/libraries/mscorlib.WinRT-Facade/ref/Configurations.props
+++ b/src/libraries/mscorlib.WinRT-Facade/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
       netstandard2.0;
       netstandard1.0;
     </BuildConfigurations>

diff --git a/src/libraries/mscorlib.WinRT-Facade/ref/mscorlib.WinRT-Facade.csproj b/src/libraries/mscorlib.WinRT-Facade/ref/mscorlib.WinRT-Facade.csproj
index 69924fa..de5ea4b 100644 (file)
--- a/src/libraries/mscorlib.WinRT-Facade/ref/mscorlib.WinRT-Facade.csproj
+++ b/src/libraries/mscorlib.WinRT-Facade/ref/mscorlib.WinRT-Facade.csproj
@@ -6,7 +6,7 @@
     <!-- do not binplace, this is only used to help compile references
          against Windows.winmd.  The real mscorlib comes from src/shims/shims.proj -->
     <BinPlaceRef>false</BinPlaceRef>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TypeForwards.cs" />

diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds
index 6b4709c..c2a1c33 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds
@@ -3,7 +3,7 @@
 
   <ItemGroup>
     <!-- identity project, runtime specific projects are included through netcoreapp.rids.props -->
-    <Project Include="$(MSBuildProjectName).pkgproj"  Condition="'$(TargetGroup)'=='netcoreapp'" />
+    <Project Include="$(MSBuildProjectName).pkgproj"  Condition="'$(TargetGroup)'=='$(NetCoreAppCurrent)'" />
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove(dir.traversal.targets))" />

diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1 b/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1
index 56e5f14..5752a69 100644 (file)
--- a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1
+++ b/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1
@@ -35,7 +35,7 @@ $dotnetPath = -join($repoRoot, "\.dotnet\dotnet.exe")
 $csprojPath = -join($PSScriptRoot, "\", (Get-ChildItem $PSScriptRoot"\*.csproj" | Select-Object -ExpandProperty Name))
 $packagesCachePath = -join($repoRoot, "\packages")
 $localPackageSourcePath = -join($repoRoot, "\artifacts\packages\Debug\")
-$targetFramework = -join("netcoreapp", $frameworkVersion)
+$targetFramework = -join("netcoreapp5.0", $frameworkVersion)
 
 if (!(Test-Path $localPackageSourcePath))
 {

diff --git a/src/libraries/pkg/runtime.native.System.IO.Ports/Configurations.props b/src/libraries/pkg/runtime.native.System.IO.Ports/Configurations.props
index 19236e7..b79c1d7 100644 (file)
--- a/src/libraries/pkg/runtime.native.System.IO.Ports/Configurations.props
+++ b/src/libraries/pkg/runtime.native.System.IO.Ports/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.builds b/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.builds
index 6b4709c..c2a1c33 100644 (file)
--- a/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.builds
+++ b/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.builds
@@ -3,7 +3,7 @@
 
   <ItemGroup>
     <!-- identity project, runtime specific projects are included through netcoreapp.rids.props -->
-    <Project Include="$(MSBuildProjectName).pkgproj"  Condition="'$(TargetGroup)'=='netcoreapp'" />
+    <Project Include="$(MSBuildProjectName).pkgproj"  Condition="'$(TargetGroup)'=='$(NetCoreAppCurrent)'" />
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove(dir.traversal.targets))" />

diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj
index 6db7b5f..0c68bde 100644 (file)
--- a/src/libraries/pkg/test/testPackages.proj
+++ b/src/libraries/pkg/test/testPackages.proj
@@ -22,7 +22,6 @@
 
     <!-- CI machines doesn't have net472 targeting pack installed yet and we hit: https://github.com/dotnet/corefx/issues/29906 -->
     <TargetFrameworksToExclude Include="net472" />
-    <TargetFrameworksToExclude Include="netfx" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/src/libraries/restore/binplacePackages/Configurations.props b/src/libraries/restore/binplacePackages/Configurations.props
index 8c2ad7f..a8698ae 100644 (file)
--- a/src/libraries/restore/binplacePackages/Configurations.props
+++ b/src/libraries/restore/binplacePackages/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       net461;
-      netfx;
+      $(NetFrameworkCurrent);
       netstandard1.1;
       netstandard1.2;
       netstandard1.3;
@@ -13,7 +13,7 @@
       netstandard2.0;
       netcoreapp2.0;
       netcoreapp3.0;
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/restore/binplacePackages/binplacePackages.depproj b/src/libraries/restore/binplacePackages/binplacePackages.depproj
index 9535d89..75a5cce 100644 (file)
--- a/src/libraries/restore/binplacePackages/binplacePackages.depproj
+++ b/src/libraries/restore/binplacePackages/binplacePackages.depproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <!-- This is to make sure that nothing unintended gets restored for netcoreapp. -->
-  <ItemGroup Condition="'$(TargetGroup)' != 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' != '$(NetCoreAppCurrent)'">
     <!-- runtime dependency: System.Diagnostics.PerformanceCounters netcoreapp2.0,net461 -->
     <PackageReference Include="System.Memory" Version="4.5.2" Condition="'$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetsNetfx)' == 'true' or ('$(TargetsNetStandard)' == 'true' and '$(NETStandardVersion)' &gt;= 1.1)" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" Condition="'$(TargetsNetStandardLowerThan21)' == 'true' or '$(TargetsNetfx)' == 'true'" />

diff --git a/src/libraries/restore/netfx/Configurations.props b/src/libraries/restore/netfx/Configurations.props
index 490a182..3a9d8d6 100644 (file)
--- a/src/libraries/restore/netfx/Configurations.props
+++ b/src/libraries/restore/netfx/Configurations.props
@@ -9,8 +9,8 @@
       net462;
       net47;
       net471;
-      netfx;
-      netcoreapp;
+      $(NetFrameworkCurrent);
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/restore/netfx/netfx.depproj b/src/libraries/restore/netfx/netfx.depproj
index 074c063..ef40cbe 100644 (file)
--- a/src/libraries/restore/netfx/netfx.depproj
+++ b/src/libraries/restore/netfx/netfx.depproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetsNetFx)' != 'true'">
     <!-- For things not .NETFramework we need the net472 targeting pack to generate facades -->
-    <AssetTargetFallback>net472</AssetTargetFallback>
+    <AssetTargetFallback>$(NetFrameworkCurrent)</AssetTargetFallback>
     <NoWarn>$(NoWarn);NU1701</NoWarn>
     <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.7.2</TargetingPackNugetPackageId>
   </PropertyGroup>
@@ -40,7 +40,7 @@
     <PackageReference Include="System.Memory" Condition="'$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46'">
       <Version>4.5.2</Version>
     </PackageReference>
-    <PackageReference Include="System.Numerics.Vectors" Condition="'$(TargetGroup)' == 'net461' or '$(TargetGroup)' == 'netfx'">
+    <PackageReference Include="System.Numerics.Vectors" Condition="'$(TargetGroup)' == 'net461' or '$(TargetGroup)' == '$(NetFrameworkCurrent)'">
       <Version>4.5.0</Version>
     </PackageReference>
     <PackageReference Include="$(NETStandardSupportPackageId)" Condition="'$(AddNetStandardSupportPackage)' == 'true'">

diff --git a/src/libraries/restore/runtime/Configurations.props b/src/libraries/restore/runtime/Configurations.props
index 2763918..1a98ff9 100644 (file)
--- a/src/libraries/restore/runtime/Configurations.props
+++ b/src/libraries/restore/runtime/Configurations.props
@@ -3,8 +3,8 @@
     <BuildConfigurations>
       netcoreapp3.0-Windows_NT;
       netcoreapp3.0-Unix;
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
+      $(NetCoreAppCurrent)-Windows_NT;
+      $(NetCoreAppCurrent)-Unix;
       mono;
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/restore/winrt/Configurations.props b/src/libraries/restore/winrt/Configurations.props
index d7ebc9b..7c50d5c 100644 (file)
--- a/src/libraries/restore/winrt/Configurations.props
+++ b/src/libraries/restore/winrt/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp3.0;
-      netcoreapp;
+      $(NetCoreAppCurrent);
       netstandard1.0;
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj
index 6f5a401..b4e732e 100644 (file)
--- a/src/libraries/shims/ApiCompat.proj
+++ b/src/libraries/shims/ApiCompat.proj
@@ -3,11 +3,13 @@
   <Import Project="Directory.Build.props" />
 
   <PropertyGroup>
+    <ApiCompatTarget>$(TargetGroup)</ApiCompatTarget>
+    <ApiCompatTarget Condition="'$(TargetsNetCoreApp)' == 'true'">netcoreapp</ApiCompatTarget>
     <ApiCompatResponseFile>$(IntermediateOutputPath)/apicompat.rsp</ApiCompatResponseFile>
-    <ApiCompatBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.$(TargetGroup).netfx461.txt</ApiCompatBaselineFile>
-    <ApiCompatBaselineIgnoreFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.$(TargetGroup).netfx461.ignore.txt</ApiCompatBaselineIgnoreFile>
-    <ApiCompatNSBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.$(TargetGroup).netstandard.txt</ApiCompatNSBaselineFile>
-    <ApiCompatNSOnlyBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.$(TargetGroup).netstandardOnly.txt</ApiCompatNSOnlyBaselineFile>
+    <ApiCompatBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netfx461.txt</ApiCompatBaselineFile>
+    <ApiCompatBaselineIgnoreFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netfx461.ignore.txt</ApiCompatBaselineIgnoreFile>
+    <ApiCompatNSBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netstandard.txt</ApiCompatNSBaselineFile>
+    <ApiCompatNSOnlyBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netstandardOnly.txt</ApiCompatNSOnlyBaselineFile>
     <ApiCompatImplementationDirs>$(RefPath.TrimEnd('\/'))</ApiCompatImplementationDirs>
     <!-- Set to true to build this project -->
     <BaselineApiCompat Condition="'$(BaselineApiCompat)' == ''">false</BaselineApiCompat>
@@ -38,7 +40,7 @@
     <WriteLinesToFile File="$(ApiCompatResponseFile)" Lines="$(ApiCompatArgs)" Overwrite="true" />
 
     <Exec Command="$(_ApiCompatCommand) &quot;@(NetFxReference -> '$(NetFxRefPath)%(Identity).dll')&quot; $(BaselineApiCompatArgs) @&quot;$(ApiCompatResponseFile)&quot; &gt; $(ApiCompatBaselineFile)"
-          Condition="'$(TargetGroup)' == 'netcoreapp' and '$(BaselineApiCompat)' == 'true'"
+          Condition="'$(TargetGroup)' == '$(NetCoreAppCurrent)' and '$(BaselineApiCompat)' == 'true'"
           CustomErrorRegularExpression="^[a-zA-Z]+ :"
           StandardOutputImportance="Low"
           IgnoreExitCode="true"
@@ -46,7 +48,7 @@
       <Output TaskParameter="ExitCode" PropertyName="ApiCompatExitCode" />
     </Exec>
 
-    <Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing netfx to $(TargetGroup)" />
+    <Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing net472 to $(ApiCompatTarget)" />
 
 
     <!--
@@ -81,7 +83,7 @@
       <Output TaskParameter="ExitCode" PropertyName="ApiCompatExitCode" />
     </Exec>
 
-    <Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing netstandard.dll to $(TargetGroup)" />
+    <Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing netstandard.dll to $(ApiCompatTarget)" />
 
     <!-- TODO: Once the repo targets netstandard2.1, have this instance of APICompat run against NetStandard21RefPath -->
     <Exec Command="$(_ApiCompatCommand) &quot;$(NetStandard20RefPath.TrimEnd('\/'))&quot; --baseline &quot;$(ApiCompatNSBaselineFile)&quot; @&quot;$(ApiCompatResponseFile)&quot;"
@@ -92,7 +94,7 @@
       <Output TaskParameter="ExitCode" PropertyName="ApiCompatExitCode" />
     </Exec>
 
-    <Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing netstandard to $(TargetGroup)" />
+    <Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing netstandard to $(ApiCompatTarget)" />
 
   </Target>
 

diff --git a/src/libraries/shims/ApiCompatBaseline.netcoreapp.netfx461.ignore.txt b/src/libraries/shims/ApiCompatBaseline.netcoreapp.netfx461.ignore.txt
index 216d95e..32abe28 100644 (file)
--- a/src/libraries/shims/ApiCompatBaseline.netcoreapp.netfx461.ignore.txt
+++ b/src/libraries/shims/ApiCompatBaseline.netcoreapp.netfx461.ignore.txt
@@ -49,7 +49,7 @@ MembersMustExist : Member 'System.AppDomain.SetupInformation.get()' does not exi
 // SetAccessControl in FileStream not going to be implemented in netcore20 as no ACL support:
 MembersMustExist : Member 'System.IO.FileStream.SetAccessControl(System.Security.AccessControl.FileSecurity)' does not exist in the implementation but it does exist in the contract.
 
-// StackTrace ctor deprecated in netfx and won't be implemented in any netcoreapp versions:
+// StackTrace ctor deprecated in net472 and won't be implemented in any netcoreapp versions:
 MembersMustExist : Member 'System.Diagnostics.StackTrace..ctor(System.Threading.Thread, System.Boolean)' does not exist in the implementation but it does exist in the contract.
 
 // Dan said there is a reason for those in System.Resrouces to ignore:

diff --git a/src/libraries/shims/Configurations.props b/src/libraries/shims/Configurations.props
index beb53a9..c50114d 100644 (file)
--- a/src/libraries/shims/Configurations.props
+++ b/src/libraries/shims/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/shims/Directory.Build.props b/src/libraries/shims/Directory.Build.props
index d496b6b..8f605de 100644 (file)
--- a/src/libraries/shims/Directory.Build.props
+++ b/src/libraries/shims/Directory.Build.props
@@ -3,7 +3,7 @@
     <!-- shared configurations between shims and apicompat -->
     <BuildConfigurations>
       $(BuildConfigurations);
-      netcoreapp;;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 

diff --git a/src/libraries/shims/generated/Configurations.props b/src/libraries/shims/generated/Configurations.props
index beb53a9..c50114d 100644 (file)
--- a/src/libraries/shims/generated/Configurations.props
+++ b/src/libraries/shims/generated/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/shims/manual/Configurations.props b/src/libraries/shims/manual/Configurations.props
index beb53a9..c50114d 100644 (file)
--- a/src/libraries/shims/manual/Configurations.props
+++ b/src/libraries/shims/manual/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file