First attempt at producing a multiframework NuGet.

squid-box · Jun 8, 2019 · d2db6ca · d2db6ca
1 parent b9d3770
commit d2db6ca
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 298 deletions.
diff --git a/SevenZip.Tests/FileCheckerTests.cs b/SevenZip.Tests/FileCheckerTests.cs
@@ -83,7 +83,7 @@ public class FileCheckerTests
         public void SetUp()
         {
             // Ensures we're in the correct working directory (for test data files).
-            Directory.SetCurrentDirectory(TestContext.CurrentContext.WorkDirectory);
+            Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
         }
 
         [TestCaseSource(nameof(TestData))]

diff --git a/SevenZip.Tests/Properties/AssemblyInfo.cs b/SevenZip.Tests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

diff --git a/SevenZip.Tests/SevenZip.Tests.csproj b/SevenZip.Tests/SevenZip.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <AssemblyTitle>SevenZip.Tests</AssemblyTitle>
     <Product>SevenZipzTests</Product>
     <Copyright>Copyright ©  2018</Copyright>

diff --git a/SevenZip.Tests/SevenZipExtractorTests.cs b/SevenZip.Tests/SevenZipExtractorTests.cs
@@ -19,7 +19,7 @@ public static List<TestFile> TestFiles
             {
                 var result = new List<TestFile>();
 
-                foreach (var file in Directory.GetFiles(Path.Combine(TestContext.CurrentContext.WorkDirectory, "TestData")))
+                foreach (var file in Directory.GetFiles(Path.Combine(TestContext.CurrentContext.TestDirectory, "TestData")))
                 {
                     if (file.Contains("multi"))
                     {

diff --git a/SevenZip.Tests/TestBase.cs b/SevenZip.Tests/TestBase.cs
@@ -14,7 +14,7 @@ public abstract class TestBase
         public void SetUp()
         {
             // Ensures we're in the correct working directory (for test data files).
-            Directory.SetCurrentDirectory(TestContext.CurrentContext.WorkDirectory);
+            Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
             Directory.CreateDirectory(OutputDirectory);
         }
 

diff --git a/SevenZip.sln b/SevenZip.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SevenZip", "SevenZip\SevenZip.csproj", "{4960DD14-3431-47EC-B9D9-9D2730A98DC3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SevenZip", "SevenZip\SevenZip.csproj", "{4960DD14-3431-47EC-B9D9-9D2730A98DC3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SevenZip.Tests", "SevenZip.Tests\SevenZip.Tests.csproj", "{67192E62-C7FE-485F-BEC4-05734A943FAA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SevenZip.Tests", "SevenZip.Tests\SevenZip.Tests.csproj", "{67192E62-C7FE-485F-BEC4-05734A943FAA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{043464C6-413E-4D0F-8A43-B23F674B1804}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/SevenZip.sln.DotSettings b/SevenZip.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=LZMA/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/SevenZip/Properties/AssemblyInfo.cs b/SevenZip/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 [assembly: CLSCompliant(true)]

diff --git a/SevenZip/SevenZip.csproj b/SevenZip/SevenZip.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ProductVersion>9.0.30729</ProductVersion>
     <AssemblyName>SevenZipSharp</AssemblyName>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>SevenZip.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags />
@@ -38,16 +38,9 @@
     <DocumentationFile>..\Stage\$(Configuration)\SevenZip.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DefineConstants>TRACE;UNMANAGED, COMPRESS, LZMA_STREAM, DOTNET20; SFX</DefineConstants>
+    <DefineConstants>TRACE;UNMANAGED</DefineConstants>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|AnyCPU' ">
-    <DocumentationFile>..\Stage\$(Configuration)\SevenZip.XML</DocumentationFile>
-    <DefineConstants>TRACE;UNMANAGED, COMPRESS, LZMA_STREAM, CS2</DefineConstants>
-    <Optimize>true</Optimize>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.configuration" />
   </ItemGroup>
@@ -97,7 +90,7 @@
     <EmbeddedResource Include="sfx\7zxSD_PPMd_x64.sfx" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
-    <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
+    <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
+    <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Security.Permissions" Version="4.5.0" />
   </ItemGroup>
 </Project>
diff --git a/SevenZip/SevenZip2010.csproj b/SevenZip/SevenZip2010.csproj
diff --git a/SevenZip/SevenZip2010.sln b/SevenZip/SevenZip2010.sln
diff --git a/appveyor.yml b/appveyor.yml
@@ -3,12 +3,14 @@ image: Visual Studio 2017
 
 configuration: Release
 
-assembly_info:
+dotnet_csproj:
   patch: true
-  file: '**\AssemblyInfo.*'
+  file: '**\*.csproj'
+  version: '{version}'
+  package_version: '{version}'
   assembly_version: '{version}'
-  assembly_file_version: '{version}'
-  assembly_informational_version: '{version}'
+  file_version: '{version}'
+  informational_version: '{version}'
 
 before_build:
   nuget restore SevenZip.sln