Modernize project and target .NET Standard 2.0

* Upgrade projects to the new "SDK style" csproj format * Remove the packages directory and packages.config file * Remove `AssemblyInfo.cs` files (replaced with equivalent csproj properties) * Remove `*.vsmdi` and `*.testsettings` files * Run tests on .NET Framework 4.7.2 + .NET Core 3.1 + .NET 6.0 * Update test dependencies to their latest version * Microsoft.NET.Test.Sdk → 17.1.0 * Moq → 4.16.1 * MSTest.TestAdapter → 2.2.8 * MSTest.TestFramework → 2.2.8 * Use `System.Text.Json` instead of `System.Web.Script.Serialization` * Use `JsonPropertyNameAttribute` instead of `FieldAttribute` * Make properties `{ get; init; }` instead of `{ get; internal set; }` with the help of the `IsExternalInit` NuGet package to support .NET Standard 2.0 * Define `JsonPropertyName` attributes for all enums and use `JsonStringEnumMemberConverter` from the `Macross.Json.Extensions` NuGet package to workaround [issues in JsonStringEnumConverter](dotnet/runtime#31619) Fixes emmettnicholas#11
0xced · Feb 17, 2022 · 0c90f16 · 0c90f16
1 parent d48ddb6
commit 0c90f16
Show file tree

Hide file tree

Showing 82 changed files with 932 additions and 17,278 deletions.
diff --git a/Local.testsettings b/Local.testsettings
diff --git a/StacMan.Tests/Properties/AssemblyInfo.cs b/StacMan.Tests/Properties/AssemblyInfo.cs
diff --git a/StacMan.Tests/StacMan.Tests.csproj b/StacMan.Tests/StacMan.Tests.csproj
@@ -1,82 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5FBD3A5B-93AE-43B7-9566-C7D08A71C8E9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <LangVersion>9.0</LangVersion>
+    <IsPackable>false</IsPackable>
     <RootNamespace>StackExchange.StacMan.Tests</RootNamespace>
-    <AssemblyName>StacMan.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ApiVersion21Tests.cs" />
-    <Compile Include="BackoffTests.cs" />
-    <Compile Include="InfoMethodTests.cs" />
-    <Compile Include="QuestionMethodTests.cs" />
-    <Compile Include="SiteMethodTests.cs" />
-    <Compile Include="TagMethodTests.cs" />
-    <Compile Include="UserMethodTests.cs" />
-    <Compile Include="Utilities\Assert2.cs" />
-    <Compile Include="Utilities\ExtensionMethods.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StacManResponseTests.cs" />
-    <Compile Include="ValidationTests.cs" />
-    <Compile Include="WrapperTests.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\StacMan\StacMan.csproj">
-      <Project>{3C310AC6-6229-41FB-B33F-8381CF4FECBF}</Project>
-      <Name>StacMan</Name>
-    </ProjectReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\StacMan\StacMan.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>
diff --git a/StacMan.Tests/packages.config b/StacMan.Tests/packages.config
diff --git a/StacMan.sln b/StacMan.sln
@@ -5,13 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StacMan", "StacMan\StacMan.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StacMan.Tests", "StacMan.Tests\StacMan.Tests.csproj", "{5FBD3A5B-93AE-43B7-9566-C7D08A71C8E9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{940A5141-7F86-40E6-BB3D-046EE0A79FB7}"
-	ProjectSection(SolutionItems) = preProject
-		Local.testsettings = Local.testsettings
-		StacMan.vsmdi = StacMan.vsmdi
-		TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = StacMan.vsmdi

diff --git a/StacMan.vsmdi b/StacMan.vsmdi
diff --git a/StacMan/Badges/BadgeType.cs b/StacMan/Badges/BadgeType.cs
@@ -1,4 +1,6 @@
-namespace StackExchange.StacMan.Badges
+using System.Text.Json.Serialization;
+
+namespace StackExchange.StacMan.Badges
 {
     /// <summary>
     /// badge_type
@@ -8,11 +10,13 @@ public enum BadgeType
         /// <summary>
         /// name
         /// </summary>
+        [JsonPropertyName("name")]
         Named,
 
         /// <summary>
         /// tag_based
         /// </summary>
+        [JsonPropertyName("tag_based")]
         TagBased
     }
 }
diff --git a/StacMan/Badges/Rank.cs b/StacMan/Badges/Rank.cs
@@ -1,4 +1,6 @@
-namespace StackExchange.StacMan.Badges
+using System.Text.Json.Serialization;
+
+namespace StackExchange.StacMan.Badges
 {
     /// <summary>
     /// rank
@@ -8,16 +10,19 @@ public enum Rank
         /// <summary>
         /// gold
         /// </summary>
+        [JsonPropertyName("gold")]
         Gold,
 
         /// <summary>
         /// silver
         /// </summary>
+        [JsonPropertyName("silver")]
         Silver,
 
         /// <summary>
         /// bronze
         /// </summary>
+        [JsonPropertyName("bronze")]
         Bronze
     }
 }
diff --git a/StacMan/Codegen/AccessToken.cs b/StacMan/Codegen/AccessToken.cs
@@ -5,6 +5,7 @@
 // </auto-generated>
 
 using System;
+using System.Text.Json.Serialization;
 
 namespace StackExchange.StacMan
 {
@@ -17,26 +18,26 @@ public partial class AccessToken : StacManType
         /// <summary>
         /// access_token
         /// </summary>
-        [Field("access_token")]
-        public string AccessTokenName { get; internal set; }
+        [JsonPropertyName("access_token")]
+        public string AccessTokenName { get; init; }
 
         /// <summary>
         /// account_id
         /// </summary>
-        [Field("account_id")]
-        public int AccountId { get; internal set; }
+        [JsonPropertyName("account_id")]
+        public int AccountId { get; init; }
 
         /// <summary>
         /// expires_on_date
         /// </summary>
-        [Field("expires_on_date")]
-        public DateTime? ExpiresOnDate { get; internal set; }
+        [JsonPropertyName("expires_on_date")]
+        public DateTime? ExpiresOnDate { get; init; }
 
         /// <summary>
         /// scope
         /// </summary>
-        [Field("scope")]
-        public string[] Scope { get; internal set; }
+        [JsonPropertyName("scope")]
+        public string[] Scope { get; init; }
 
     }
 }
diff --git a/StacMan/Codegen/AccountMerge.cs b/StacMan/Codegen/AccountMerge.cs
@@ -5,6 +5,7 @@
 // </auto-generated>
 
 using System;
+using System.Text.Json.Serialization;
 
 namespace StackExchange.StacMan
 {
@@ -17,20 +18,20 @@ public partial class AccountMerge : StacManType
         /// <summary>
         /// merge_date -- introduced in API version 2.1
         /// </summary>
-        [Field("merge_date")]
-        public DateTime MergeDate { get; internal set; }
+        [JsonPropertyName("merge_date")]
+        public DateTime MergeDate { get; init; }
 
         /// <summary>
         /// new_account_id -- introduced in API version 2.1
         /// </summary>
-        [Field("new_account_id")]
-        public int NewAccountId { get; internal set; }
+        [JsonPropertyName("new_account_id")]
+        public int NewAccountId { get; init; }
 
         /// <summary>
         /// old_account_id -- introduced in API version 2.1
         /// </summary>
-        [Field("old_account_id")]
-        public int OldAccountId { get; internal set; }
+        [JsonPropertyName("old_account_id")]
+        public int OldAccountId { get; init; }
 
     }
 }