From 7f7960d95628d8c61e6ce836198bb7efa86e8ac9 Mon Sep 17 00:00:00 2001 From: EvilBeaver Date: Thu, 16 Jun 2022 09:54:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=B0=D1=86?= =?UTF-8?q?=D0=B5=D0=BB=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0?= =?UTF-8?q?=20=D1=84=D1=80=D0=B5=D0=B9=D0=BC=D0=B2=D0=BE=D1=80=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - введена переменная TargetFrameworkId - ей установлено значение net462 --- Build.csproj | 17 +++++++++-------- src/ASPNETHandler/HTTPServices.csproj | 2 +- src/Component/Component.csproj | 2 +- .../OneScript.DebugProtocol.csproj | 4 ++-- .../OneScript.DebugServices.csproj | 2 +- .../OneScript.Language.csproj | 4 ++-- .../OneScriptDocumenter.csproj | 2 +- .../ScriptEngine.HostedScript.csproj | 8 ++++---- .../ScriptEngine.NativeApi.vcxproj | 9 +++++---- src/ScriptEngine/ScriptEngine.csproj | 10 +++++----- src/StandaloneRunner/StandaloneRunner.csproj | 5 +++-- src/TestApp/TestApp.csproj | 2 +- .../VSCode.DebugAdapter.csproj | 2 +- src/oscommon.targets | 1 + src/oscript/oscript.csproj | 9 ++------- 15 files changed, 39 insertions(+), 40 deletions(-) diff --git a/Build.csproj b/Build.csproj index f6ca554b0..eecff998e 100644 --- a/Build.csproj +++ b/Build.csproj @@ -9,6 +9,7 @@ $(MSBuildProjectDirectory)/built $(MSBuildProjectDirectory)/src/1Script.sln Release + net462 @@ -31,11 +32,11 @@ - + - + @@ -75,21 +76,21 @@ - + $(TempFolder)/bin - + $(TempFolder)/bin32 - + - + $(TempFolder)/bin - + $(TempFolder)/bin32 @@ -100,7 +101,7 @@ - $(MSBuildProjectDirectory)/src/VSCode.DebugAdapter/bin/$(Configuration)/net452 + $(MSBuildProjectDirectory)/src/VSCode.DebugAdapter/bin/$(Configuration)/$(TargetFrameworkId) diff --git a/src/ASPNETHandler/HTTPServices.csproj b/src/ASPNETHandler/HTTPServices.csproj index b8873cbfe..5c2718918 100644 --- a/src/ASPNETHandler/HTTPServices.csproj +++ b/src/ASPNETHandler/HTTPServices.csproj @@ -5,7 +5,7 @@ ASPNETHandler HTTP services for 1Script ASPNETHandler - net452 + $(TargetFrameworkId) diff --git a/src/Component/Component.csproj b/src/Component/Component.csproj index b163bdc6b..0193718b9 100644 --- a/src/Component/Component.csproj +++ b/src/Component/Component.csproj @@ -3,7 +3,7 @@ - net452 + $(TargetFrameworkId) Debug;Release AnyCPU diff --git a/src/OneScript.DebugProtocol/OneScript.DebugProtocol.csproj b/src/OneScript.DebugProtocol/OneScript.DebugProtocol.csproj index ed890ffb6..569bbdcb8 100644 --- a/src/OneScript.DebugProtocol/OneScript.DebugProtocol.csproj +++ b/src/OneScript.DebugProtocol/OneScript.DebugProtocol.csproj @@ -7,11 +7,11 @@ Debug;Release 1Script Debug Protocol common objects and DTO's AnyCPU - net452;netstandard2.0 + $(TargetFrameworkId);netstandard2.0 - + diff --git a/src/OneScript.DebugServices/OneScript.DebugServices.csproj b/src/OneScript.DebugServices/OneScript.DebugServices.csproj index 32ca77019..fc34e62a8 100644 --- a/src/OneScript.DebugServices/OneScript.DebugServices.csproj +++ b/src/OneScript.DebugServices/OneScript.DebugServices.csproj @@ -2,7 +2,7 @@ - net452;netstandard2.0 + $(TargetFrameworkId);netstandard2.0 Debug services for apps hosting 1script engine Copyright (c) 2020 EvilBeaver diff --git a/src/OneScript.Language/OneScript.Language.csproj b/src/OneScript.Language/OneScript.Language.csproj index 8f1c6e2df..f43bea5a4 100644 --- a/src/OneScript.Language/OneScript.Language.csproj +++ b/src/OneScript.Language/OneScript.Language.csproj @@ -2,7 +2,7 @@ - net452;netstandard2.0;netstandard2.1; + $(TargetFrameworkId);netstandard2.0;netstandard2.1; @@ -17,7 +17,7 @@ BSL 1C 1Script OneScript - + diff --git a/src/OneScriptDocumenter/OneScriptDocumenter.csproj b/src/OneScriptDocumenter/OneScriptDocumenter.csproj index 1c97d9451..979c99457 100644 --- a/src/OneScriptDocumenter/OneScriptDocumenter.csproj +++ b/src/OneScriptDocumenter/OneScriptDocumenter.csproj @@ -3,7 +3,7 @@ - net452 + $(TargetFrameworkId) Exe OneScript Libraries Documenter diff --git a/src/ScriptEngine.HostedScript/ScriptEngine.HostedScript.csproj b/src/ScriptEngine.HostedScript/ScriptEngine.HostedScript.csproj index 9e0b95113..650477a16 100644 --- a/src/ScriptEngine.HostedScript/ScriptEngine.HostedScript.csproj +++ b/src/ScriptEngine.HostedScript/ScriptEngine.HostedScript.csproj @@ -2,7 +2,7 @@ - net452;netstandard2.0;netstandard2.1 + $(TargetFrameworkId);netstandard2.0;netstandard2.1 Debug;Release AnyCPU @@ -26,11 +26,11 @@ OneScript OpenSource Community 2015 BSL 1C 1Script OneScript - - bin\Release\net452\ScriptEngine.HostedScript.xml + + bin\Release\$(TargetFrameworkId)\ScriptEngine.HostedScript.xml 1701;1702;1705;1591 - + diff --git a/src/ScriptEngine.NativeApi/ScriptEngine.NativeApi.vcxproj b/src/ScriptEngine.NativeApi/ScriptEngine.NativeApi.vcxproj index 4085f973c..cdfe387de 100644 --- a/src/ScriptEngine.NativeApi/ScriptEngine.NativeApi.vcxproj +++ b/src/ScriptEngine.NativeApi/ScriptEngine.NativeApi.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -73,22 +74,22 @@ true - $(ProjectDir)bin\x86\$(Configuration)\net452\ + $(ProjectDir)bin\x86\$(Configuration)\$(TargetFrameworkId)\ $(ProjectName)32 false - $(ProjectDir)bin\x86\$(Configuration)\net452\ + $(ProjectDir)bin\x86\$(Configuration)\$(TargetFrameworkId)\ $(ProjectName)32 true - $(ProjectDir)\bin\$(Configuration)\net452\ + $(ProjectDir)\bin\$(Configuration)\$(TargetFrameworkId)\ $(ProjectName)64 false - $(ProjectDir)\bin\$(Configuration)\net452\ + $(ProjectDir)\bin\$(Configuration)\$(TargetFrameworkId)\ $(ProjectName)64 diff --git a/src/ScriptEngine/ScriptEngine.csproj b/src/ScriptEngine/ScriptEngine.csproj index ca990352f..3a4195b5b 100644 --- a/src/ScriptEngine/ScriptEngine.csproj +++ b/src/ScriptEngine/ScriptEngine.csproj @@ -3,7 +3,7 @@ - net452;netstandard2.0;netstandard2.1 + $(TargetFrameworkId);netstandard2.0;netstandard2.1 Debug;Release AnyCPU @@ -21,8 +21,8 @@ BSL 1C 1Script OneScript - - bin\Release\net452\ScriptEngine.xml + + bin\Release\$(TargetFrameworkId)\ScriptEngine.xml 1701;1702;1705;1591 @@ -31,10 +31,10 @@ - + - + diff --git a/src/StandaloneRunner/StandaloneRunner.csproj b/src/StandaloneRunner/StandaloneRunner.csproj index 03cd55417..3cc638b6f 100644 --- a/src/StandaloneRunner/StandaloneRunner.csproj +++ b/src/StandaloneRunner/StandaloneRunner.csproj @@ -1,7 +1,8 @@  + - net452 + $(TargetFrameworkId) AnyCPU;x86 Debug;Release @@ -37,7 +38,7 @@ - + diff --git a/src/TestApp/TestApp.csproj b/src/TestApp/TestApp.csproj index 23d60a775..2d9d79b85 100644 --- a/src/TestApp/TestApp.csproj +++ b/src/TestApp/TestApp.csproj @@ -3,7 +3,7 @@ - net452 + $(TargetFrameworkId) logo.ico WinExe diff --git a/src/VSCode.DebugAdapter/VSCode.DebugAdapter.csproj b/src/VSCode.DebugAdapter/VSCode.DebugAdapter.csproj index a9ae926fe..05bce9317 100644 --- a/src/VSCode.DebugAdapter/VSCode.DebugAdapter.csproj +++ b/src/VSCode.DebugAdapter/VSCode.DebugAdapter.csproj @@ -3,7 +3,7 @@ - net452 + $(TargetFrameworkId) Exe VSCode.DebugAdapter.Program Debug;Release diff --git a/src/oscommon.targets b/src/oscommon.targets index 840c635c6..51763c942 100644 --- a/src/oscommon.targets +++ b/src/oscommon.targets @@ -8,6 +8,7 @@ Release x86 7.3 + net462 diff --git a/src/oscript/oscript.csproj b/src/oscript/oscript.csproj index 585a9e3dd..439dd3d09 100644 --- a/src/oscript/oscript.csproj +++ b/src/oscript/oscript.csproj @@ -3,7 +3,7 @@ - net452 + $(TargetFrameworkId) Exe oscript.Program @@ -16,20 +16,15 @@ - - bin\x86\Debug\net452\oscript.xml + bin\x86\Debug\$(TargetFrameworkId)\oscript.xml false - false bin\x86\Debug - 4 - x86 obj\x86\Debug -