diff --git a/Compiler/Compiler.sln b/Compiler/Compiler.sln index cabeccc..8e6d1a5 100644 --- a/Compiler/Compiler.sln +++ b/Compiler/Compiler.sln @@ -1,17 +1,23 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30413.136 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "skc5", "skc5\skc5.csproj", "{6307BDF9-19E4-4925-99DC-29773D8F0AF1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "skc5", "skc5\skc5.csproj", "{6307BDF9-19E4-4925-99DC-29773D8F0AF1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharp.Tasks", "CSharp.Tasks\CSharp.Tasks.csproj", "{4D31FC05-54E2-48F7-9DEF-4FDB2179A872}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E09479B2-B122-4FD9-B68E-8A863AC2587D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Cecil", "..\external\cecil\Mono.Cecil.csproj", "{A305E28E-36BE-4E4D-9141-EFE5515506F9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.NRefactory", "..\external\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.NRefactory.CSharp", "..\external\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj", "{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.NRefactory.Cecil", "..\external\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj", "{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}" +EndProject Global - GlobalSection(SubversionScc) = preSolution - Svn-Managed = True - Manager = AnkhSVN - Subversion Support for Visual Studio - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms @@ -41,8 +47,69 @@ Global {4D31FC05-54E2-48F7-9DEF-4FDB2179A872}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {4D31FC05-54E2-48F7-9DEF-4FDB2179A872}.Release|Mixed Platforms.Build.0 = Release|Any CPU {4D31FC05-54E2-48F7-9DEF-4FDB2179A872}.Release|x86.ActiveCfg = Release|Any CPU + {A305E28E-36BE-4E4D-9141-EFE5515506F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A305E28E-36BE-4E4D-9141-EFE5515506F9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A305E28E-36BE-4E4D-9141-EFE5515506F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A305E28E-36BE-4E4D-9141-EFE5515506F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A305E28E-36BE-4E4D-9141-EFE5515506F9}.Debug|x86.ActiveCfg = Debug|Any CPU + {A305E28E-36BE-4E4D-9141-EFE5515506F9}.Debug|x86.Build.0 = Debug|Any CPU + {A305E28E-36BE-4E4D-9141-EFE5515506F9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A305E28E-36BE-4E4D-9141-EFE5515506F9}.Release|Any CPU.Build.0 = Release|Any CPU + {A305E28E-36BE-4E4D-9141-EFE5515506F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A305E28E-36BE-4E4D-9141-EFE5515506F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A305E28E-36BE-4E4D-9141-EFE5515506F9}.Release|x86.ActiveCfg = Release|Any CPU + {A305E28E-36BE-4E4D-9141-EFE5515506F9}.Release|x86.Build.0 = Release|Any CPU + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Debug|x86.ActiveCfg = Debug|Any CPU + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Debug|x86.Build.0 = Debug|Any CPU + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Release|Any CPU.Build.0 = Release|Any CPU + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Release|x86.ActiveCfg = Release|Any CPU + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Release|x86.Build.0 = Release|Any CPU + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Debug|Any CPU.Build.0 = Debug|Any CPU + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Debug|x86.ActiveCfg = Debug|Any CPU + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Debug|x86.Build.0 = Debug|Any CPU + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Release|Any CPU.ActiveCfg = Release|Any CPU + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Release|Any CPU.Build.0 = Release|Any CPU + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Release|x86.ActiveCfg = Release|Any CPU + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Release|x86.Build.0 = Release|Any CPU + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Debug|x86.ActiveCfg = Debug|Any CPU + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Debug|x86.Build.0 = Debug|Any CPU + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Release|Any CPU.Build.0 = Release|Any CPU + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Release|x86.ActiveCfg = Release|Any CPU + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {A305E28E-36BE-4E4D-9141-EFE5515506F9} = {E09479B2-B122-4FD9-B68E-8A863AC2587D} + {9C9FDE34-87E5-4257-A01C-FDA80EFC71D9} = {E09479B2-B122-4FD9-B68E-8A863AC2587D} + {880778E7-07E2-4F6C-A0A6-C7D6BAEAB563} = {E09479B2-B122-4FD9-B68E-8A863AC2587D} + {9FD870BF-C9EA-4D63-A180-1EB7EFD5E659} = {E09479B2-B122-4FD9-B68E-8A863AC2587D} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A0E115D7-0217-43FA-ACB0-82407F484C24} + EndGlobalSection + GlobalSection(SubversionScc) = preSolution + Svn-Managed = True + Manager = AnkhSVN - Subversion Support for Visual Studio + EndGlobalSection EndGlobal diff --git a/Compiler/skc5/Compiler/CompilerTool.cs b/Compiler/skc5/Compiler/CompilerTool.cs index 16a62a5..8d2d30f 100644 --- a/Compiler/skc5/Compiler/CompilerTool.cs +++ b/Compiler/skc5/Compiler/CompilerTool.cs @@ -918,7 +918,7 @@ void EmbedResources() EmbeddedResourceFiles.Add(att.Filename); var resName = att.ResourceName ?? att.Filename; Log.WriteLine("Embedding {0} -> {1}", att.Filename, resName); - var res = new EmbeddedResource(resName, ManifestResourceAttributes.Public, File.ReadAllBytes(att.Filename)); + var res = new EmbeddedResource(resName, Mono.Cecil.ManifestResourceAttributes.Public, File.ReadAllBytes(att.Filename)); var res2 = asm.Resources.Where(t => t.Name == res.Name).OfType().FirstOrDefault(); if (res2 == null) { diff --git a/Compiler/skc5/Compiler/SourceMapping/SourceMapping.cs b/Compiler/skc5/Compiler/SourceMapping/SourceMapping.cs index 0e880f6..34c2ec0 100644 --- a/Compiler/skc5/Compiler/SourceMapping/SourceMapping.cs +++ b/Compiler/skc5/Compiler/SourceMapping/SourceMapping.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using System.Web.Script.Serialization; using System.IO; using System.Runtime.Serialization; diff --git a/Compiler/skc5/Compiler/SourceMapping/SourceMappingV3.cs b/Compiler/skc5/Compiler/SourceMapping/SourceMappingV3.cs index c00c7fd..2cadb9e 100644 --- a/Compiler/skc5/Compiler/SourceMapping/SourceMappingV3.cs +++ b/Compiler/skc5/Compiler/SourceMapping/SourceMappingV3.cs @@ -2,8 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using System.Web.Script.Serialization; using System.IO; +using System.Text.Json; +using System.Text.Json.Serialization; namespace SharpKit.Compiler.SourceMapping { @@ -43,7 +44,7 @@ public void SaveAs(string filename) { if (mappings == null) GenerateMappings(); - var s = new JavaScriptSerializer().Serialize(this); + var s = JsonSerializer.Serialize(this); File.WriteAllText(filename, s); } public int version { get; set; } @@ -53,13 +54,12 @@ public void SaveAs(string filename) public List sources { get; set; } public List names { get; set; } public string mappings { get; set; } - [ScriptIgnore] + [JsonIgnore] public List> ParsedMappings { get; set; } public static SourceMappingV3Document Load(string filename) { - var ser = new JavaScriptSerializer(); - var doc = ser.Deserialize(File.ReadAllText(filename)); + var doc = JsonSerializer.Deserialize(File.ReadAllText(filename)); doc.ParseMappings(); return doc; } diff --git a/Compiler/skc5/Properties/AssemblyInfo.cs b/Compiler/skc5/Properties/AssemblyInfo.cs index 2d97ace..51db2fb 100644 --- a/Compiler/skc5/Properties/AssemblyInfo.cs +++ b/Compiler/skc5/Properties/AssemblyInfo.cs @@ -5,14 +5,6 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("skc5")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("skc5")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] // 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 @@ -20,7 +12,6 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("98ad7271-73df-4455-b85e-f6d1937514f8")] // Version information for an assembly consists of the following four values: // @@ -32,5 +23,3 @@ // 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("1.0.0.0")] -[assembly: AssemblyFileVersion("5.5.0")] diff --git a/Compiler/skc5/skc5.csproj b/Compiler/skc5/skc5.csproj index bd4d66a..23a9755 100644 --- a/Compiler/skc5/skc5.csproj +++ b/Compiler/skc5/skc5.csproj @@ -1,192 +1,32 @@ - - - - - Debug - AnyCPU - {6307BDF9-19E4-4925-99DC-29773D8F0AF1} - Exe - Properties - SharpKit - skc5 - v4.7.2 - 512 - $(MSBuildProjectDirectory)..\..\lib\ - 12.0.0 - 2.0 - - - - - - AnyCPU - true - full - false - bin\ - TRACE;DEBUG - prompt - 4 - false - false - - - AnyCPU - pdbonly - true - bin\ - TRACE - prompt - 4 - false - false - - - - ..\..\external\AjaxMin\AjaxMinDll\bin\AjaxMinDll.dll - - - ..\..\external\corex\src\corex\bin\corex.dll - - - ..\..\external\NRefactory\bin\net_4_5_Debug\ICSharpCode.NRefactory.dll - ..\..\external\NRefactory\bin\net_4_5_Release\ICSharpCode.NRefactory.dll - - - ..\..\external\NRefactory\bin\net_4_5_Debug\ICSharpCode.NRefactory.Cecil.dll - ..\..\external\NRefactory\bin\net_4_5_Release\ICSharpCode.NRefactory.Cecil.dll - - - ..\..\external\NRefactory\bin\net_4_5_Debug\ICSharpCode.NRefactory.CSharp.dll - ..\..\external\NRefactory\bin\net_4_5_Release\ICSharpCode.NRefactory.CSharp.dll - - - False - ..\..\external\cecil\bin\net_4_0_Debug\Mono.Cecil.dll - ..\..\external\cecil\bin\net_4_0_Release\Mono.Cecil.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - - - - rem xcopy $(TargetDir)*.* C:\Windows\Microsoft.NET\Framework\v4.0.30319\SharpKit\5\ /C /Y /d - - #cp $(TargetDir)*.* C:\Windows\Microsoft.NET\Framework\v4.0.30319\SharpKit\5\ /C /Y /d - - - - \ No newline at end of file + + + Exe + netcoreapp3.1 + $(MSBuildProjectDirectory)..\..\lib\ + bin + false + 5.5.0 + + + + + + + + + + + + + + + ..\..\external\AjaxMin\AjaxMinDll\bin\AjaxMinDll.dll + + + ..\..\external\corex\src\corex\bin\corex.dll + + + + + + diff --git a/SDK b/SDK index 66a6e64..822b931 160000 --- a/SDK +++ b/SDK @@ -1 +1 @@ -Subproject commit 66a6e64436c6254b60b7ea5aee54d026fff78237 +Subproject commit 822b931905d7316db189c4a046037074e8b1a057 diff --git a/external/NRefactory b/external/NRefactory index bf6c674..79bbe8b 160000 --- a/external/NRefactory +++ b/external/NRefactory @@ -1 +1 @@ -Subproject commit bf6c674791768028861dbf50bcbd0519af7fd839 +Subproject commit 79bbe8b4ddb1fb18edfed1b83f63a330ca426be4 diff --git a/external/cecil b/external/cecil index db1e41d..3edd588 160000 --- a/external/cecil +++ b/external/cecil @@ -1 +1 @@ -Subproject commit db1e41dc16ab35f4aa6149ea4b60e8f940a5b82a +Subproject commit 3edd588bd7b513425dd11141b9cae1c7beb2ecda