Revert "Revert "Added C# 7.0 support #4""

Zaczero · Zaczero · commit eb5cfc4c2cb4 · 2017-06-27T18:43:07.000+02:00
This reverts commit 4b6b2e5.
diff --git a/SharpLoader/App.config b/SharpLoader/App.config
@@ -1,6 +1,6 @@
-﻿<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/SharpLoader/Core/RuntimeCompiler.cs b/SharpLoader/Core/RuntimeCompiler.cs
@@ -2,7 +2,7 @@
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Microsoft.CSharp;
+using Microsoft.CodeDom.Providers.DotNetCompilerPlatform;
 
 namespace SharpLoader.Core
 {
@@ -12,7 +12,7 @@ public class RuntimeCompiler
 
         public RuntimeCompiler()
         {
-            _compiler = new CSharpCodeProvider(new Dictionary<string, string> { { "CompilerVersion", "v4.0" } });
+            _compiler = new CSharpCodeProvider();
         }
 
         public bool Compile(string outputName, string compilerArguments, string[] assemblies, params string[] sources)
diff --git a/SharpLoader/FodyWeavers.xml b/SharpLoader/FodyWeavers.xml
@@ -0,0 +1,4 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <Costura />
+</Weavers>
diff --git a/SharpLoader/Program.cs b/SharpLoader/Program.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
@@ -14,10 +15,6 @@ namespace SharpLoader
 {
     public static class Program
     {
-        /* Limitations:
-         * supports only c# 5.0
-         */
-
         /* Exit codes:
          * 0 - default
          * 1 - data file not found
@@ -38,18 +35,19 @@ public static class Program
         private const int SW_SHOW = 5;
 
         public const string Author = "Zaczero";
-        public const string Version = "2.0.1";
+        public const string Version = "2.1";
 
         private const int ReadBufferSize = ushort.MaxValue;
 
         private const string ConfigFileName = "SharpLoader.ini";
         private static readonly string MyPath = Process.GetCurrentProcess().MainModule.FileName;
         private static readonly string MyDirectory = Path.GetDirectoryName(MyPath);
-        public static string ConfigPath = Path.Combine(MyDirectory, ConfigFileName);
+        public static string ConfigPath;
 
         public static List<string> DragDropPaths;
         public static int Seed = -1;
         public static string Hash;
+        public static string SaveDir;
 
         private static MainForm _form;
         private static bool _outToConsole;
@@ -69,7 +67,7 @@ public static void Main(string[] args)
             for (var i = 0; i < args.Length; i++)
             {
                 // Argument is path
-                if (args[i] != MyPath && (File.Exists(args[i]) || Directory.Exists(args[i])))
+                if ((File.Exists(args[i]) || Directory.Exists(args[i])) && Path.GetExtension(args[i]) != ".exe")
                 {
                     // Directory
                     if (File.GetAttributes(args[i]).HasFlag(FileAttributes.Directory))
@@ -94,6 +92,12 @@ public static void Main(string[] args)
                 // Normal argument
                 else
                 {
+                    if (args[i] == "-cmd")
+                    {
+                        cmdMode = true;
+                        continue;
+                    }
+
                     // Multiple arguments
                     if (i + 1 < args.Length)
                     {
@@ -105,14 +109,12 @@ public static void Main(string[] args)
                             {
                                 throw new Exception($"invalid seed value: {args[i + 1]}");
                             }
+                            i++;
                         }
-                    }
-                    // Single argument
-                    else
-                    {
-                        if (args[i] == "-cmd")
+                        else if (args[i] == "-path")
                         {
-                            cmdMode = true;
+                            SaveDir = args[i + 1];
+                            i++;
                         }
                     }
                 }
@@ -124,6 +126,18 @@ public static void Main(string[] args)
                 Seed = new Random(Environment.TickCount).Next(0, int.MaxValue);
             }
 
+            if (string.IsNullOrEmpty(SaveDir))
+            {
+                ConfigPath = Path.Combine(MyDirectory, ConfigFileName);
+                SaveDir = MyDirectory;
+            }
+            else
+            {
+                ConfigPath = Path.Combine(SaveDir, ConfigFileName);
+            }
+
+            DumpToAppData();
+
             // Show UI
             if (!cmdMode)
             {
@@ -161,6 +175,55 @@ public static void Main(string[] args)
             }
         }
 
+        public static void DumpToAppData()
+        {
+            var appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SharpLoader");
+            var exePath = Path.Combine(appDataPath, "SharpLoader.exe");
+            var thisPath = Process.GetCurrentProcess().MainModule.FileName;
+
+            if (thisPath != exePath)
+            {
+                if (!Directory.Exists(appDataPath))
+                {
+                    Directory.CreateDirectory(appDataPath);
+                }
+
+                // Run the newest file
+                File.Copy(thisPath, exePath, true);
+                
+                var argsString = string.Empty;
+                foreach (var arg in Environment.GetCommandLineArgs())
+                {
+                    if (File.Exists(arg))
+                    {
+                        argsString += $"\"{arg}\" ";
+                    }
+                    else
+                    {
+                        argsString += $"{arg} ";
+                    }
+                }
+                argsString = argsString.TrimEnd(' ');
+
+                Process.Start(exePath, $"{argsString} -path \"{SaveDir}\"");
+                Environment.Exit(0);
+            }
+
+            var binPath = Path.Combine(appDataPath, "bin");
+            var binZipPath = Path.Combine(appDataPath, "bin.zip");
+
+            if (!Directory.Exists(binPath))
+            {
+                if (!File.Exists(binZipPath))
+                {
+                    WriteResourceToFile("SharpLoader.bin.zip", binZipPath);
+                }
+
+                ZipFile.ExtractToDirectory(binZipPath, binPath);
+                File.Delete(binZipPath);
+            }
+        }
+
         public static int Compile()
         {
             var randomizer = new SourceRandomizer(Seed);
@@ -239,6 +302,8 @@ public static int Compile()
                 return 2;
             }
 
+            outputName = Path.Combine(SaveDir, outputName);
+
             // Read sources
             var userSourceFiles = new List<string>();
 
@@ -410,8 +475,10 @@ public static int Compile()
                 return 4;
             }
 
+            int.TryParse("lol", out int parseeed);
+
             Console.ForegroundColor = ConsoleColor.Green;
-            Out($"-=: Done [{outputName}] {(_outToConsole ? "(press any key to exit)" : string.Empty)}");
+            Out($"-=: Done [{Path.GetFileName(outputName)}] {(_outToConsole ? "(press any key to exit)" : string.Empty)}");
 
             var sourceBytes = new List<byte>();
             foreach (var s in compileSourceFiles)
@@ -482,6 +549,17 @@ public static void CleanTemp()
             }
         }
 
+        private static void WriteResourceToFile(string resourceName, string fileName)
+        {
+            using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName))
+            {
+                using (var file = new FileStream(fileName, FileMode.Create, FileAccess.Write))
+                {
+                    resource.CopyTo(file);
+                }
+            }
+        }
+
         private static IEnumerable<string> GetFilesFromDirectory(string directory)
         {
             var dir = new DirectoryInfo(directory);
diff --git a/SharpLoader/Properties/AssemblyInfo.cs b/SharpLoader/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]
diff --git a/SharpLoader/SelectForm.cs b/SharpLoader/SelectForm.cs
@@ -32,6 +32,7 @@ private void ThemeKeyDown(object sender, KeyEventArgs e)
 
         private void CloseClick(object sender, EventArgs e)
         {
+            Program.CleanTemp();
             Application.Exit();
         }
 
diff --git a/SharpLoader/SharpLoader.csproj b/SharpLoader/SharpLoader.csproj
@@ -1,5 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.5\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.5\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
+  <Import Project="packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props" Condition="Exists('packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,11 +10,12 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>SharpLoader</RootNamespace>
     <AssemblyName>SharpLoader</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -40,6 +43,13 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Costura, Version=1.6.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.5\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -81,6 +91,8 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.manifest" />
+    <EmbeddedResource Include="bin.zip" />
+    <None Include="packages.config" />
     <None Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -97,5 +109,19 @@
       <DependentUpon>SelectForm.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="FodyWeavers.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.5\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.5\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+    <Error Condition="!Exists('packages\Fody.2.1.0\build\netstandard1.0\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.2.1.0\build\netstandard1.0\Fody.targets'))" />
+    <Error Condition="!Exists('packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
+  </Target>
+  <Import Project="packages\Fody.2.1.0\build\netstandard1.0\Fody.targets" Condition="Exists('packages\Fody.2.1.0\build\netstandard1.0\Fody.targets')" />
+  <Import Project="packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
 </Project>
diff --git a/SharpLoader/bin.zip b/SharpLoader/bin.zip
diff --git a/SharpLoader/packages.config b/SharpLoader/packages.config
@@ -0,0 +1,7 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Costura.Fody" version="1.6.2" targetFramework="net462" developmentDependency="true" />
+  <package id="Fody" version="2.1.0" targetFramework="net462" developmentDependency="true" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.5" targetFramework="net462" />
+  <package id="Microsoft.Net.Compilers" version="2.1.0" targetFramework="net462" developmentDependency="true" />
+</packages>

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.CodeDom.Compiler;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Diagnostics;`
`5`		`-using Microsoft.CSharp;`
	`5`	`+using Microsoft.CodeDom.Providers.DotNetCompilerPlatform;`
`6`	`6`
`7`	`7`	`namespace SharpLoader.Core`
`8`	`8`	`{`
`@@ -12,7 +12,7 @@ public class RuntimeCompiler`
`12`	`12`
`13`	`13`	`public RuntimeCompiler()`
`14`	`14`	`{`
`15`		`- _compiler = new CSharpCodeProvider(new Dictionary<string, string> { { "CompilerVersion", "v4.0" } });`
	`15`	`+ _compiler = new CSharpCodeProvider();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public bool Compile(string outputName, string compilerArguments, string[] assemblies, params string[] sources)`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ private void ThemeKeyDown(object sender, KeyEventArgs e)`
`32`	`32`
`33`	`33`	`private void CloseClick(object sender, EventArgs e)`
`34`	`34`	`{`
	`35`	`+ Program.CleanTemp();`
`35`	`36`	`Application.Exit();`
`36`	`37`	`}`
`37`	`38`