Move to proper TargetFramework value

dotnet · Sep 1, 2020 · aec9f9d · aec9f9d
1 parent ecebb9c
commit aec9f9d
Show file tree

Hide file tree

Showing 25 changed files with 62 additions and 62 deletions.
diff --git a/BUILDING.md b/BUILDING.md
@@ -68,7 +68,7 @@ There are three test assemblies in the solution:
 - **TestPublic.dll** in the folder `test/TestPublic`.
 - **Microsoft.ML.Probabilistic.Learners.Tests.dll** in the folder `test/Learners/LearnersTests`. 
 
-Depending on the build configuration and targeted framework, the assemblies will be located in the `bin/Debug<Core|Full>/<net50|net461>` or `bin/Release<Core|Full>/<net50|net461>` subdirectories
+Depending on the build configuration and targeted framework, the assemblies will be located in the `bin/Debug<Core|Full>/<net5.0|net461>` or `bin/Release<Core|Full>/<net5.0|net461>` subdirectories
 of the test project.
 
 Runner executes tests in parallel by default. However, some test category must be run

diff --git a/build/evaluator-netcore.yml b/build/evaluator-netcore.yml
@@ -14,6 +14,6 @@ steps:
   inputs:
     targetType: 'inline'
     script: dotnet Evaluator.dll InferNetRunsOnly.xml
-    workingDirectory: ${{ format('src/Learners/Runners/Evaluator/bin/{0}/net50', parameters.Configuration) }}
+    workingDirectory: ${{ format('src/Learners/Runners/Evaluator/bin/{0}/net5.0', parameters.Configuration) }}
     displayName: Running Evaluator
     continueOnError: true
diff --git a/docs/_build/makeApiDocs.ps1 b/docs/_build/makeApiDocs.ps1
@@ -41,7 +41,7 @@ if (!(Test-Path $projPath)) {
 & "$dotnetExe" build "$projPath" /p:Configuration=Release
 
 Write-Host "Run PrepareSource for InferNet_Copy_Temp folder"
-$prepareSourcePath = [IO.Path]::GetFullPath((join-path $sourceDirectory 'src/Tools/PrepareSource/bin/Release/net50/Microsoft.ML.Probabilistic.Tools.PrepareSource.dll'))
+$prepareSourcePath = [IO.Path]::GetFullPath((join-path $sourceDirectory 'src/Tools/PrepareSource/bin/Release/net5.0/Microsoft.ML.Probabilistic.Tools.PrepareSource.dll'))
 & "$dotnetExe" "$prepareSourcePath" "$destinationDirectory"
 
 Write-Host "Install nuget package docfx.console"

diff --git a/src/Examples/ClickThroughModel/ClickThroughModel.csproj b/src/Examples/ClickThroughModel/ClickThroughModel.csproj
@@ -17,17 +17,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/src/Examples/Crowdsourcing/Crowdsourcing.csproj b/src/Examples/Crowdsourcing/Crowdsourcing.csproj
@@ -17,17 +17,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/src/Examples/CrowdsourcingWithWords/CrowdsourcingWithWords.csproj b/src/Examples/CrowdsourcingWithWords/CrowdsourcingWithWords.csproj
@@ -16,17 +16,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/src/Examples/InferNET101/InferNET101.csproj b/src/Examples/InferNET101/InferNET101.csproj
@@ -16,17 +16,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/src/Examples/LDA/LDA.csproj b/src/Examples/LDA/LDA.csproj
@@ -18,17 +18,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/src/Examples/MotifFinder/MotifFinder.csproj b/src/Examples/MotifFinder/MotifFinder.csproj
@@ -18,17 +18,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/src/Examples/ReviewerCalibration/ReviewerCalibration.csproj b/src/Examples/ReviewerCalibration/ReviewerCalibration.csproj
@@ -17,17 +17,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/src/Examples/RobustGaussianProcess/RobustGaussianProcess.csproj b/src/Examples/RobustGaussianProcess/RobustGaussianProcess.csproj
@@ -16,17 +16,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/src/Learners/ClassifierModels/ClassifierModels.csproj b/src/Learners/ClassifierModels/ClassifierModels.csproj
@@ -19,19 +19,19 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
         <!-- No need to generate code twice -->
         <IgnorePostBuildNetCore>true</IgnorePostBuildNetCore>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
     <RunPostBuildNetCore Condition="$(IgnorePostBuildNetCore) != 'true'">true</RunPostBuildNetCore>
   </PropertyGroup>

diff --git a/src/Learners/RecommenderModels/RecommenderModels.csproj b/src/Learners/RecommenderModels/RecommenderModels.csproj
@@ -19,19 +19,19 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
         <!-- No need to generate code twice -->
         <IgnorePostBuildNetCore>true</IgnorePostBuildNetCore>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
     <RunPostBuildNetCore Condition="$(IgnorePostBuildNetCore) != 'true'">true</RunPostBuildNetCore>
   </PropertyGroup>

diff --git a/src/Learners/Runners/CommandLine/CommandLine.csproj b/src/Learners/Runners/CommandLine/CommandLine.csproj
@@ -18,17 +18,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/src/Learners/Runners/Evaluator/Evaluator.csproj b/src/Learners/Runners/Evaluator/Evaluator.csproj
@@ -18,17 +18,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/src/Tools/BuildFactorDoc/Tools.BuildFactorDoc.csproj b/src/Tools/BuildFactorDoc/Tools.BuildFactorDoc.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net50</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>Microsoft.ML.Probabilistic.Tools.BuildFactorDoc</RootNamespace>
     <AssemblyName>Microsoft.ML.Probabilistic.Tools.BuildFactorDoc</AssemblyName>
   </PropertyGroup>

diff --git a/src/Tools/PrepareSource/Tools.PrepareSource.csproj b/src/Tools/PrepareSource/Tools.PrepareSource.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net50</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Microsoft.ML.Probabilistic.Tools.PrepareSource</AssemblyName>
     <RootNamespace>Microsoft.ML.Probabilistic.Tools.PrepareSource</RootNamespace>
   </PropertyGroup>

diff --git a/src/Tutorials/Tutorials.csproj b/src/Tutorials/Tutorials.csproj
@@ -20,18 +20,18 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
         <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/test/Learners/LearnersTests/LearnersTests.csproj b/test/Learners/LearnersTests/LearnersTests.csproj
@@ -15,17 +15,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/test/Learners/TestApp/TestApp.csproj b/test/Learners/TestApp/TestApp.csproj
@@ -18,17 +18,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 

diff --git a/test/TestApp/TestApp.csproj b/test/TestApp/TestApp.csproj
@@ -20,17 +20,17 @@
     </When>
     <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
       <PropertyGroup>
-        <TargetFramework>net50</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net50;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>