Merge pull request #249 from avadev/jwenger/revert-extra-projects

Jwenger/revert extra projects
avadev · Aug 10, 2024 · 9325aeb · 9325aeb
2 parents ed49745 + 653ce6a
commit 9325aeb
Show file tree

Hide file tree

Showing 23 changed files with 103 additions and 2,602 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -21,7 +21,6 @@ jobs:
           3.1.x
           5.0.x
           6.0.x
-          8.0.x
     - name: Setup MSBuild
       uses: microsoft/setup-msbuild@v1
     - name: Restore Tests

diff --git a/Avalara.AvaTax.RestClient.sln b/Avalara.AvaTax.RestClient.sln
diff --git a/src/AvaTaxOfflineHelper.cs b/src/AvaTaxOfflineHelper.cs
@@ -145,8 +145,7 @@ private static void WriteZipRateFile(TaxRateModel zipRate, string zip, string pa
             TextWriter writer = null;
 
             try {
-                DirectoryInfo directory = new DirectoryInfo(path);
-                directory.GetAccessControl();
+                Directory.GetAccessControl(path);
                 var content = JsonConvert.SerializeObject(zipRate);
                 writer = new StreamWriter(Path.Combine(path, zip + ".json"));
                 writer.Write(content);

diff --git a/src/Avalara.AvaTax.RestClient.csproj b/src/Avalara.AvaTax.RestClient.csproj
@@ -1,14 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
+		<TargetFrameworks>net20;net45;net461;net472;netstandard1.6;netstandard2.0</TargetFrameworks>
 		<DelaySign>false</DelaySign>
-		<TargetFrameworks>net20;net45;net461;net472;netstandard1.6;netstandard2.0;net6.0;net8.0</TargetFrameworks>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>Avalara.AvaTax.RestClient.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
-
 
-	<!-- .NET Framework 2.0 -->
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net20' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>NETFRAMEWORK;TRACE;DEBUG;NET20</DefineConstants>
 		<GenerateDocumentationFile>false</GenerateDocumentationFile>
@@ -17,9 +15,8 @@
 		<DefineConstants>NETFRAMEWORK;TRACE;RELEASE;NET20</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-
-
-	<!-- .NET Framework 4.5 -->
+
+
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net45' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>NETFRAMEWORK;TRACE;DEBUG;PORTABLE;NET45</DefineConstants>
 		<GenerateDocumentationFile>false</GenerateDocumentationFile>
@@ -28,9 +25,8 @@
 		<DefineConstants>NETFRAMEWORK;TRACE;RELEASE;PORTABLE;NET45</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-
 
-	<!-- .NET Framework 4.6.1 -->
+
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net461' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>NETFRAMEWORK;TRACE;DEBUG;PORTABLE;NET461</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -39,84 +35,80 @@
 		<DefineConstants>NETFRAMEWORK;TRACE;RELEASE;PORTABLE;NET461</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-
 
-	<!-- .NET Framework 4.7.2 -->
+
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net472' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>NETFRAMEWORK;TRACE;DEBUG;PORTABLE;NET472</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
+
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net472' AND '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
 		<DefineConstants>NETFRAMEWORK;TRACE;RELEASE;PORTABLE;NET472</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-
-
-	<!-- .NET Standard 1.6 -->
+
 	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.6' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>TRACE;DEBUG;PORTABLE;NETSTANDARD1_6</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
+
 	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.6' AND '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
 		<DefineConstants>TRACE;RELEASE;PORTABLE;NETSTANDARD1_6</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-
 
-	<!-- .NET Standard 2.0 -->
-	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 		<DefineConstants>TRACE;DEBUG;PORTABLE;NETSTANDARD2_0</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' AND '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+
+	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 		<DefineConstants>TRACE;RELEASE;PORTABLE;NETSTANDARD2_0</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
 
 
-	<!-- .NET 6.0 -->
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-		<DefineConstants>TRACE;DEBUG;PORTABLE;NET6_0</DefineConstants>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' AND '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-		<DefineConstants>TRACE;RELEASE;PORTABLE;NET6_0</DefineConstants>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-	</PropertyGroup>
-
-
-	<!-- .NET 8.0 -->
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-		<DefineConstants>TRACE;DEBUG;PORTABLE;NET8_0</DefineConstants>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' AND '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-		<DefineConstants>TRACE;RELEASE;PORTABLE;NET8_0</DefineConstants>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-	</PropertyGroup>
-
-
 	<ItemGroup>
 		<None Remove="**" />
 		<Folder Include="enums" />
-		<Folder Include="models" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<Folder Include="models" />		
 	</ItemGroup>
-
-
-	<!-- .NET Framework 2.0 doesn't have a System.Net.Http package, so it can't be included-->
-	<Choose>
-		<When Condition="'$(TargetFramework)' == 'net20'">
-			<ItemGroup>
-				<Compile Include="..\GlobalAssemblyInfo.cs">
-					<Link>Properties\GlobalAssemblyInfo.cs</Link>
-				</Compile>
-			</ItemGroup>
-		</When>
-		<Otherwise>
-			<ItemGroup>
-				<PackageReference Include="System.Net.Http" Version="4.3.4" />
-			</ItemGroup>
-		</Otherwise>
-	</Choose>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net20'">
+		<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+		<Compile Include="..\GlobalAssemblyInfo.cs">
+			<Link>Properties\GlobalAssemblyInfo.cs</Link>
+		</Compile>
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
+		<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+		<Reference Include="System.Net.Http" />
+		<Compile Include="..\GlobalAssemblyInfo.cs">
+			<Link>Properties\GlobalAssemblyInfo.cs</Link>
+		</Compile>
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+		<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+		<Reference Include="System.Net.Http" />
+		<Compile Include="..\GlobalAssemblyInfo.cs">
+			<Link>Properties\GlobalAssemblyInfo.cs</Link>
+		</Compile>
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="System.Net.Http" Version="4.3.2" />
+		<Compile Include="..\GlobalAssemblyInfo.cs">
+			<Link>Properties\GlobalAssemblyInfo.cs</Link>
+		</Compile>
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="System.Net.Http" Version="4.3.2" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="System.Net.Http" Version="4.3.2" />
+	</ItemGroup>
+	<ItemGroup>
+
+  </ItemGroup>
 </Project>
diff --git a/tests/Avalara.AvaTax.RestClient.Test.csproj b/tests/Avalara.AvaTax.RestClient.Test.csproj
@@ -1,78 +1,88 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net451;net45;net461;net472;netcoreapp2.2.8;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net451;net45;net461;net472;netcoreapp2.2;netcoreapp3.1</TargetFrameworks>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 	</PropertyGroup>
-
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net451'">
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Nunit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+		<Compile Remove="**\*.*" />
+		<None Remove="**" />
 	</ItemGroup>
-
-
-	<!-- .NET Framework 4.5.1 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
-
+		<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+		<PackageReference Include="Nunit" Version="3.13.3" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+		<Reference Include="System.Net.Http" />
+		<Compile Include="net20\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=net20</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
-
-	<!-- .NET Framework 4.5 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
-
+		<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+		<PackageReference Include="Nunit" Version="3.13.3" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+		<Reference Include="System.Net.Http" />
+		<Compile Include="net45\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=net45</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
-
-	<!-- .NET Framework 4.6.1 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
-
+		<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+		<PackageReference Include="Nunit" Version="3.13.3" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+		<Reference Include="System.Net.Http" />
+		<Compile Include="net461\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=net461</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
-
-	<!-- .NET Framework 4.7.2 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
-
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="System.Net.Http" Version="4.3.2" />
+		<PackageReference Include="Nunit" Version="3.13.3" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+		<Compile Include="net472\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=net472</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
-
-	<!-- .NET Core 2.2.8 -->
-	<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2.8'">
-
+	<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="NUnit" Version="3.12.0" />
+		<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+		<PackageReference Include="System.Net.Http" Version="4.3.2" />
+		<Compile Include="netstandard\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=netstandard1.6</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
-
-	<!-- .NET Core 3.1 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Nunit" Version="3.13.3" />
+		<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+		<PackageReference Include="System.Net.Http" Version="4.3.2" />
+		<Compile Include="netstandard20\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
-
-	<!-- .NET 6.0 -->
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-
-		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
-		  <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
-		</ProjectReference>
-	</ItemGroup>
-
-	<!-- .NET 8.0 -->
-	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
-		  <SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
-		</ProjectReference>
-	</ItemGroup>
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,6 @@ jobs: @@
 .1.x
 .0.x
 .0.x
-.0.x
         - name: Setup MSBuild
           uses: microsoft/setup-msbuild@v1
         - name: Restore Tests
@@ Expand Down @@