Migrate to netstandard2.0 and net472 (#178)

This is the prerequisite for the next nuget packages update.
SergeyTeplyakov · May 12, 2020 · 0b2be23 · 0b2be23
1 parent 5936058
commit 0b2be23
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 17 deletions.
diff --git a/src/ErrorProne.NET.Cli/ErrorProne.NET.Cli.csproj b/src/ErrorProne.NET.Cli/ErrorProne.NET.Cli.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 

diff --git a/src/ErrorProne.NET.Core/ErrorProne.NET.Core.csproj b/src/ErrorProne.NET.Core/ErrorProne.NET.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ErrorProne.NET.CoreAnalyzers.CodeFixes/ErrorProne.NET.CoreAnalyzers.CodeFixes.csproj b/src/ErrorProne.NET.CoreAnalyzers.CodeFixes/ErrorProne.NET.CoreAnalyzers.CodeFixes.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>ErrorProne.Net.CoreAnalyzers.CodeFixes</AssemblyName>
     <RootNamespace>ErrorProne.NET</RootNamespace>
     <IncludeBuildOutput>false</IncludeBuildOutput>
@@ -10,14 +10,9 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
-  </PropertyGroup>
-
   <PropertyGroup>
     <PackageId>ErrorProne.NET.CoreAnalyzers</PackageId>
     <Authors>Sergey Teplyakov</Authors>
-    <PackageVersion>1.3.0.0</PackageVersion>
     <PackageLicenseUrl>https://github.com/SergeyTeplyakov/ErrorProne.NET/blob/master/LICENSE</PackageLicenseUrl>
     <RepositoryUrl>https://github.com/SergeyTeplyakov/ErrorProne.NET/</RepositoryUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/ErrorProne.NET.CoreAnalyzers/ErrorProne.NET.CoreAnalyzers.csproj b/src/ErrorProne.NET.CoreAnalyzers/ErrorProne.NET.CoreAnalyzers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>ErrorProne.Net.CoreAnalyzers</AssemblyName>
     <RootNamespace>ErrorProne.NET</RootNamespace>
   </PropertyGroup>

diff --git a/src/ErrorProne.NET.StructAnalyzers.CodeFixes/ErrorProne.NET.StructAnalyzers.CodeFixes.csproj b/src/ErrorProne.NET.StructAnalyzers.CodeFixes/ErrorProne.NET.StructAnalyzers.CodeFixes.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>ErrorProne.Net.StructAnalyzers.CodeFixes</AssemblyName>
     <RootNamespace>ErrorProne.Net.StructAnalyzers</RootNamespace>
     <IncludeBuildOutput>false</IncludeBuildOutput>

diff --git a/src/ErrorProne.NET.StructAnalyzers/ErrorProne.NET.StructAnalyzers.csproj b/src/ErrorProne.NET.StructAnalyzers/ErrorProne.NET.StructAnalyzers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>ErrorProne.Net.StructAnalyzers</AssemblyName>
     <RootNamespace>ErrorProne.Net.StructAnalyzers</RootNamespace>
   </PropertyGroup>

diff --git a/src/ErrorProne.NET.StructAnalyzers/ReadOnlinessAnalyzer.cs b/src/ErrorProne.NET.StructAnalyzers/ReadOnlinessAnalyzer.cs
@@ -22,7 +22,7 @@ public enum ReadOnlyRefFriendliness
         /// <summary>
         /// A struct can be used in readonly ref contexts because the struct has fields only and doesn't have props or methods.
         /// </summary>
-        FrienlyPoco,
+        FriendlyPoco,
 
         /// <summary>
         /// A should not be used in readonly ref contexts because it consists of properties and methods,
@@ -32,7 +32,7 @@ public enum ReadOnlyRefFriendliness
 
         /// <summary>
         /// A struct has fields and methods/properties, so it is impossible to decide immediately whether its safe to use it
-        /// in readonly ref contexts or not. Further analysis is reuired (based on how variable is used).
+        /// in readonly ref contexts or not. Further analysis is required (based on how variable is used).
         /// </summary>
         Unknown,
     }
@@ -94,7 +94,7 @@ public static ReadOnlyRefFriendliness AnalyzeReadOnlyFriendliness(this ITypeSymb
             if (!hasPropertiesOrMethods)
             {
                 // No methods/properties: POCO or empty
-                return ReadOnlyRefFriendliness.FrienlyPoco;
+                return ReadOnlyRefFriendliness.FriendlyPoco;
             }
 
             if (!hasFields)

diff --git a/src/ErrorProne.NET.Vsix/ErrorProne.NET.Vsix.csproj b/src/ErrorProne.NET.Vsix/ErrorProne.NET.Vsix.csproj
@@ -3,7 +3,7 @@
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <AssemblyName>ErrorProne.NET</AssemblyName>
   </PropertyGroup>
 
@@ -35,7 +35,7 @@
 
   <ItemGroup>
     <!-- https://github.com/dotnet/sdk/issues/433 -->
-    <ProjectReference Update="@(ProjectReference)" AdditionalProperties="TargetFramework=netstandard1.3" />
+    <ProjectReference Update="@(ProjectReference)" AdditionalProperties="TargetFramework=netstandard2.0" />
 
     <!-- https://github.com/Microsoft/extendvs/issues/57 -->
     <ProjectReference Update="@(ProjectReference)" Name="%(Filename)" />

diff --git a/src/RoslynNunitTestRunner/ErrorProne.NET.TestHelpers.csproj b/src/RoslynNunitTestRunner/ErrorProne.NET.TestHelpers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>