Kaynağa Gözat

增加linux发布脚本Publish-linux-x64.ps1
Tool移到Share中

tanghai 3 yıl önce
ebeveyn
işleme
53b3bd2063

+ 1 - 0
.gitignore

@@ -69,3 +69,4 @@ Server/.DS_Store
 /Unity/UserSettings
 /Unity/Unity.Codes.csproj
 /Unity/Unity.Ignore.csproj
+Publish/

+ 40 - 0
DotNet/DotNet.sln

@@ -0,0 +1,40 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.App", "App\DotNet.App.csproj", "{4948005C-3806-4C92-BA41-D27319A2B4B4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Core", "Core\DotNet.Core.csproj", "{E49D926E-53B5-4F16-BA8A-816694BD7C92}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Hotfix", "Hotfix\DotNet.Hotfix.csproj", "{0EEA95E0-0040-4B3C-B7FD-0E4F38F90A07}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Model", "Model\DotNet.Model.csproj", "{49855D78-0347-462B-AB98-90E4138C2AED}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.ThirdParty", "ThirdParty\DotNet.ThirdParty.csproj", "{19A11666-4891-4E73-B826-1B24D7A62080}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4948005C-3806-4C92-BA41-D27319A2B4B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4948005C-3806-4C92-BA41-D27319A2B4B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4948005C-3806-4C92-BA41-D27319A2B4B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4948005C-3806-4C92-BA41-D27319A2B4B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E49D926E-53B5-4F16-BA8A-816694BD7C92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E49D926E-53B5-4F16-BA8A-816694BD7C92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E49D926E-53B5-4F16-BA8A-816694BD7C92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E49D926E-53B5-4F16-BA8A-816694BD7C92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EEA95E0-0040-4B3C-B7FD-0E4F38F90A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EEA95E0-0040-4B3C-B7FD-0E4F38F90A07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EEA95E0-0040-4B3C-B7FD-0E4F38F90A07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EEA95E0-0040-4B3C-B7FD-0E4F38F90A07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49855D78-0347-462B-AB98-90E4138C2AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49855D78-0347-462B-AB98-90E4138C2AED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49855D78-0347-462B-AB98-90E4138C2AED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49855D78-0347-462B-AB98-90E4138C2AED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19A11666-4891-4E73-B826-1B24D7A62080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19A11666-4891-4E73-B826-1B24D7A62080}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19A11666-4891-4E73-B826-1B24D7A62080}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19A11666-4891-4E73-B826-1B24D7A62080}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal

+ 2 - 0
DotNet/DotNet.sln.DotSettings

@@ -412,6 +412,7 @@ II.2.12 <HandlesEvent />
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EXml_002ECodeStyle_002EFormatSettingsUpgrade_002EXmlMoveToCommonFormatterSettingsUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002ERider_002EBackend_002EFeatures_002EDebugger_002ESettings_002EMigration_002ERiderSymbolServersSettingsUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/TextControl/HighlightCurrentLine/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/MsTestProvider/UseTestRunConfigFromMetadataFile/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UpdatesManger/IsDownloadUpdateDataAllowed/@EntryValue">False</s:Boolean>
@@ -994,6 +995,7 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
 	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Subtract/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Tab/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Up/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/RiderDebugger/RiderRestoreDecompile/RestoreDecompileSetting/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/SnapshotsStore/CurrentStore/@EntryValue">C:\Users\USER-PC\AppData\Local\JetBrains\Shared\vAny\Sessions</s:String>
 	<s:Boolean x:Key="/Default/SymbolServers/RestoreDecompileSetting/@EntryValue">False</s:Boolean>
 	<s:Double x:Key="/Default/TimelineLayout/MethodsPanelHeight/@EntryValue">366</s:Double></wpf:ResourceDictionary>

+ 1 - 0
DotNet/DotNet.sln.DotSettings.user

@@ -1,3 +1,4 @@
 <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:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">VISIBLE_FILES</s:String>
+	<s:Int64 x:Key="/Default/Environment/Hierarchy/GeneratedFilesCacheKey/Timestamp/@EntryValue">82</s:Int64>
 	<s:String x:Key="/Default/Housekeeping/OptionsDialog/SelectedPageId/@EntryValue">XamlPreviewOptionsPage</s:String></wpf:ResourceDictionary>

+ 1 - 0
DotNet/Hotfix/DotNet.Hotfix.csproj

@@ -18,6 +18,7 @@
         <DefineConstants>DOTNET</DefineConstants>
         <OutputPath>..\..\Bin\</OutputPath>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Optimize>false</Optimize>
     </PropertyGroup>
     <ItemGroup>
 

+ 1 - 0
DotNet/Model/DotNet.Model.csproj

@@ -20,6 +20,7 @@
         <OutputPath>..\..\Bin\</OutputPath>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Optimize>false</Optimize>
     </PropertyGroup>
     <ItemGroup>
 

+ 0 - 4
DotNet/ThirdParty/DotNet.ThirdParty.csproj

@@ -47,10 +47,6 @@
         <Link>libkcp.dylib</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
-      <Content Include="..\..\Unity\Assets\Plugins\MacOS\x86_64\libkcp.dylib">
-        <Link>libkcp.dylib</Link>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
       <Content Include="..\..\Unity\Assets\Plugins\MacOS\libRecastDll.dylib">
         <Link>libRecastDll.dylib</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+ 15 - 15
ET.sln

@@ -33,14 +33,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Model", "DotNet\Mode
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.ThirdParty", "DotNet\ThirdParty\DotNet.ThirdParty.csproj", "{4B15C845-B5BD-4105-AE91-9B057F8AC134}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Tool", "DotNet\Tool\DotNet.Tool.csproj", "{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Codes", "Unity\Unity.Codes.csproj", "{C8CDB918-7F4F-0E46-C7AA-900F18D8C944}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Share", "Share", "{1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Share.Analyzer", "Share\Analyzer\Share.Analyzer.csproj", "{FCB2EF97-BA34-49F7-B859-68E1AC98877E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Share.Tool", "Share\Tool\Share.Tool.csproj", "{1D028A2B-515C-49E2-923B-094CBD89BE5A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -207,18 +207,6 @@ Global
 		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Release|x64.Build.0 = Release|Any CPU
 		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Release|x86.ActiveCfg = Release|Any CPU
 		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Release|x86.Build.0 = Release|Any CPU
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Debug|x64.Build.0 = Debug|Any CPU
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Debug|x86.Build.0 = Debug|Any CPU
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Release|x64.ActiveCfg = Release|Any CPU
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Release|x64.Build.0 = Release|Any CPU
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Release|x86.ActiveCfg = Release|Any CPU
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Release|x86.Build.0 = Release|Any CPU
 		{C8CDB918-7F4F-0E46-C7AA-900F18D8C944}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C8CDB918-7F4F-0E46-C7AA-900F18D8C944}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C8CDB918-7F4F-0E46-C7AA-900F18D8C944}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -243,6 +231,18 @@ Global
 		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|x64.Build.0 = Release|Any CPU
 		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|x86.ActiveCfg = Release|Any CPU
 		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|x86.Build.0 = Release|Any CPU
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Debug|x64.Build.0 = Debug|Any CPU
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Debug|x86.Build.0 = Debug|Any CPU
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|x64.ActiveCfg = Release|Any CPU
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|x64.Build.0 = Release|Any CPU
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|x86.ActiveCfg = Release|Any CPU
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -261,9 +261,9 @@ Global
 		{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{6AFC109E-85DE-4A14-9C81-95D93C3F90AE} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{4B15C845-B5BD-4105-AE91-9B057F8AC134} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{C8CDB918-7F4F-0E46-C7AA-900F18D8C944} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{FCB2EF97-BA34-49F7-B859-68E1AC98877E} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
+		{1D028A2B-515C-49E2-923B-094CBD89BE5A} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

+ 6 - 0
Publish-linux-x64.ps1

@@ -0,0 +1,6 @@
+dotnet publish -r linux-x64 --no-self-contained --no-dependencies -c Release
+$path = ".\Publish\linux-x64"
+Remove-Item $path\Bin\ -Recurse -ErrorAction Ignore
+Copy-Item .\Bin\linux-x64\publish -Destination $path\Bin -Recurse -Force
+Remove-Item $path\Config -Recurse -ErrorAction Ignore
+Copy-Item .\Config -Destination $path\Config  -Recurse -Force

+ 0 - 0
DotNet/Tool/ExcelExporter/ExcelExporter.cs → Share/Tool/ExcelExporter/ExcelExporter.cs


+ 0 - 0
DotNet/Tool/Init.cs → Share/Tool/Init.cs


+ 0 - 0
DotNet/Tool/Proto2CS/Proto2CS.cs → Share/Tool/Proto2CS/Proto2CS.cs


+ 2 - 2
DotNet/Tool/DotNet.Tool.csproj → Share/Tool/Share.Tool.csproj

@@ -55,8 +55,8 @@
     </ItemGroup>
     
     <ItemGroup>
-      <ProjectReference Include="..\Core\DotNet.Core.csproj" />
-      <ProjectReference Include="..\ThirdParty\DotNet.ThirdParty.csproj" />
+      <ProjectReference Include="..\..\DotNet\Core\DotNet.Core.csproj" />
+      <ProjectReference Include="..\..\DotNet\ThirdParty\DotNet.ThirdParty.csproj" />
     </ItemGroup>
 
 </Project>

+ 0 - 0
DotNet/Tool/Template.txt → Share/Tool/Template.txt


+ 0 - 1
Unity/Assets/Scripts/Core/Object/ProtoObject.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Runtime.Serialization;
 
 namespace ET
 {