Merge pull request #16 from Goose-Bomb/dev

Migrate to .NET Core 3.0
Nullkooland · Nov 2, 2019 · f05b9fe · f05b9fe
2 parents fe8596b + 665b6c9
commit f05b9fe
Show file tree

Hide file tree

Showing 44 changed files with 242 additions and 849 deletions.
diff --git a/GBCLV3.Tests/AssetTest.cs b/GBCLV3.Tests/AssetTest.cs
@@ -1,8 +1,5 @@
 using System.Diagnostics;
 using System.Linq;
-using GBCLV3.Models;
-using GBCLV3.Services;
-using GBCLV3.Services.Launcher;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace GBCLV3.Tests

diff --git a/GBCLV3.Tests/GBCLV3.Tests.csproj b/GBCLV3.Tests/GBCLV3.Tests.csproj
@@ -56,12 +56,6 @@
     <Compile Include="VersionTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\GBCLV3\GBCLV3.csproj">
-      <Project>{d0538262-7697-4a67-804d-1bfc6fdd141b}</Project>
-      <Name>GBCLV3</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="MSTest.TestAdapter">
       <Version>2.0.0</Version>

diff --git a/GBCLV3.Tests/InstallTest.cs b/GBCLV3.Tests/InstallTest.cs
@@ -1,8 +1,5 @@
 using System.Diagnostics;
 using System.Linq;
-using GBCLV3.Services;
-using GBCLV3.Services.Launcher;
-using GBCLV3.Services.Installation;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace GBCLV3.Tests

diff --git a/GBCLV3.Tests/LaunchTest.cs b/GBCLV3.Tests/LaunchTest.cs
@@ -1,8 +1,5 @@
 using System.Diagnostics;
 using System.Linq;
-using GBCLV3.Models.Launcher;
-using GBCLV3.Services;
-using GBCLV3.Services.Launcher;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace GBCLV3.Tests

diff --git a/GBCLV3.Tests/LibraryTest.cs b/GBCLV3.Tests/LibraryTest.cs
@@ -1,9 +1,5 @@
 using System.Diagnostics;
 using System.Linq;
-using GBCLV3.Models;
-using GBCLV3.Models.Launcher;
-using GBCLV3.Services;
-using GBCLV3.Services.Launcher;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace GBCLV3.Tests

diff --git a/GBCLV3.Tests/ModTest.cs b/GBCLV3.Tests/ModTest.cs
@@ -1,6 +1,4 @@
 using System.Diagnostics;
-using GBCLV3.Services;
-using GBCLV3.Services.Launcher;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace GBCLV3.Tests

diff --git a/GBCLV3.Tests/ResourcePackTest.cs b/GBCLV3.Tests/ResourcePackTest.cs
@@ -1,7 +1,5 @@
 using System.Diagnostics;
 using System.Linq;
-using GBCLV3.Services;
-using GBCLV3.Services.Launcher;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace GBCLV3.Tests

diff --git a/GBCLV3.Tests/TestUtils.cs b/GBCLV3.Tests/TestUtils.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using System.Net.Http;
-using GBCLV3.Models;
 
 namespace GBCLV3.Tests
 {

diff --git a/GBCLV3.Tests/UpdateTest.cs b/GBCLV3.Tests/UpdateTest.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Linq;
-using GBCLV3.Services;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace GBCLV3.Tests

diff --git a/GBCLV3.Tests/VersionTest.cs b/GBCLV3.Tests/VersionTest.cs
@@ -1,8 +1,5 @@
 using System.Diagnostics;
 using System.Linq;
-using GBCLV3.Models;
-using GBCLV3.Services;
-using GBCLV3.Services.Launcher;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace GBCLV3.Tests

diff --git a/GBCLV3.sln b/GBCLV3.sln
@@ -3,30 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GBCLV3", "GBCLV3\GBCLV3.csproj", "{D0538262-7697-4A67-804D-1BFC6FDD141B}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GBCLV3.Tests", "GBCLV3.Tests\GBCLV3.Tests.csproj", "{EC2B8F3E-4270-4D6A-AFFD-1677BB36F256}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GBCLV3", "GBCLV3\GBCLV3.csproj", "{509B9E05-0B99-448A-B2E4-E1E0ED105D47}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D0538262-7697-4A67-804D-1BFC6FDD141B}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{D0538262-7697-4A67-804D-1BFC6FDD141B}.Debug|x64.ActiveCfg = Debug|x64
-		{D0538262-7697-4A67-804D-1BFC6FDD141B}.Debug|x64.Build.0 = Debug|x64
-		{D0538262-7697-4A67-804D-1BFC6FDD141B}.Release|Any CPU.ActiveCfg = Release|x64
-		{D0538262-7697-4A67-804D-1BFC6FDD141B}.Release|x64.ActiveCfg = Release|x64
-		{D0538262-7697-4A67-804D-1BFC6FDD141B}.Release|x64.Build.0 = Release|x64
-		{EC2B8F3E-4270-4D6A-AFFD-1677BB36F256}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{EC2B8F3E-4270-4D6A-AFFD-1677BB36F256}.Debug|x64.ActiveCfg = Debug|x64
 		{EC2B8F3E-4270-4D6A-AFFD-1677BB36F256}.Debug|x64.Build.0 = Debug|x64
-		{EC2B8F3E-4270-4D6A-AFFD-1677BB36F256}.Release|Any CPU.ActiveCfg = Release|x64
 		{EC2B8F3E-4270-4D6A-AFFD-1677BB36F256}.Release|x64.ActiveCfg = Release|x64
 		{EC2B8F3E-4270-4D6A-AFFD-1677BB36F256}.Release|x64.Build.0 = Release|x64
+		{509B9E05-0B99-448A-B2E4-E1E0ED105D47}.Debug|x64.ActiveCfg = Debug|x64
+		{509B9E05-0B99-448A-B2E4-E1E0ED105D47}.Debug|x64.Build.0 = Debug|x64
+		{509B9E05-0B99-448A-B2E4-E1E0ED105D47}.Release|x64.ActiveCfg = Release|x64
+		{509B9E05-0B99-448A-B2E4-E1E0ED105D47}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/GBCLV3/Bootstrapper.cs b/GBCLV3/Bootstrapper.cs
diff --git a/GBCLV3/FodyWeavers.xml b/GBCLV3/FodyWeavers.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
     <PropertyChanged/>
-    <Costura/>
 </Weavers>
diff --git a/GBCLV3/FodyWeavers.xsd b/GBCLV3/FodyWeavers.xsd
@@ -33,92 +33,6 @@
             </xs:attribute>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Costura" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:all>
-              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="IncludeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>The order of preloaded assemblies, delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-            </xs:all>
-            <xs:attribute name="CreateTemporaryAssemblies" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IncludeDebugSymbols" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="DisableCompression" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="DisableCleanup" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="LoadAtModuleInit" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IgnoreSatelliteAssemblies" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="ExcludeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IncludeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="Unmanaged64Assemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="PreloadOrder" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>The order of preloaded assemblies, delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-          </xs:complexType>
-        </xs:element>
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>