Переменная для нацеливания на фреймворк

- введена переменная TargetFrameworkId - ей установлено значение net462
EvilBeaver · Jun 16, 2022 · 7f7960d · 7f7960d
1 parent 4992e64
commit 7f7960d
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 40 deletions.
diff --git a/Build.csproj b/Build.csproj
@@ -9,6 +9,7 @@
         <ArtifactsRoot>$(MSBuildProjectDirectory)/built</ArtifactsRoot>
         <Solution>$(MSBuildProjectDirectory)/src/1Script.sln</Solution>
         <Configuration>Release</Configuration>
+        <TargetFrameworkId>net462</TargetFrameworkId>
     </PropertyGroup>
 
     <ItemGroup>
@@ -31,11 +32,11 @@
         <Delete Files="@(TestsResults)" />
         <DeleteTree Directories="$(ArtifactsRoot)" Condition="Exists($(ArtifactsRoot))" />
 
-        <MSBuild Projects="$(Solution)" Targets="Clean" Properties="ReleaseNumber=$(ReleaseNumber);Configuration=$(Configuration);Platform=%(PlatformItem.MSBuildName)"/>
+        <MSBuild Projects="$(Solution)" Targets="restore;Clean" Properties="ReleaseNumber=$(ReleaseNumber);Configuration=$(Configuration);Platform=%(PlatformItem.MSBuildName);TargetFrameworkId=$(TargetFrameworkId)"/>
 
     </Target>  
         <Target Name="Make">
-        <MSBuild Projects="$(Solution)" Targets="restore;Build" Properties="ReleaseNumber=$(ReleaseNumber);Configuration=$(Configuration);Platform=%(PlatformItem.MSBuildName);"/>
+        <MSBuild Projects="$(Solution)" Targets="restore;Build" Properties="ReleaseNumber=$(ReleaseNumber);Configuration=$(Configuration);Platform=%(PlatformItem.MSBuildName);TargetFrameworkId=$(TargetFrameworkId)"/>
     </Target>
 
     <Target Name="CreateDistributions" DependsOnTargets="CreateInstaller;CreateNuget;CreateZip">
@@ -75,21 +76,21 @@
         <ItemGroup>
             <BuiltProjects Include="oscript" />
             <BuiltProjects Include="TestApp" />
-            <BinaryFiles Include="$(MSBuildProjectDirectory)/src/%(BuiltProjects.Identity)/bin/$(Configuration)/net452/**">
+            <BinaryFiles Include="$(MSBuildProjectDirectory)/src/%(BuiltProjects.Identity)/bin/$(Configuration)/$(TargetFrameworkId)/**">
                 <Dest>$(TempFolder)/bin</Dest>
             </BinaryFiles>
-            <BinaryFiles Include="$(MSBuildProjectDirectory)/src/%(BuiltProjects.Identity)/bin/x86/$(Configuration)/net452/**">
+            <BinaryFiles Include="$(MSBuildProjectDirectory)/src/%(BuiltProjects.Identity)/bin/x86/$(Configuration)/$(TargetFrameworkId)/**">
                 <Dest>$(TempFolder)/bin32</Dest>
             </BinaryFiles>
-            <AspFiles Include="$(MSBuildProjectDirectory)/src/ASPNETHandler/bin/$(Configuration)/net452/ASPNETHandler.dll"/>
+            <AspFiles Include="$(MSBuildProjectDirectory)/src/ASPNETHandler/bin/$(Configuration)/$(TargetFrameworkId)/ASPNETHandler.dll"/>
         </ItemGroup>
 
         <ItemGroup>
             <BuiltProjects Include="ScriptEngine.NativeApi" />
-            <BinaryFiles Include="$(MSBuildProjectDirectory)/src/%(BuiltProjects.Identity)/bin/$(Configuration)/net452/*.dll">
+            <BinaryFiles Include="$(MSBuildProjectDirectory)/src/%(BuiltProjects.Identity)/bin/$(Configuration)/$(TargetFrameworkId)/*.dll">
                 <Dest>$(TempFolder)/bin</Dest>
             </BinaryFiles>
-            <BinaryFiles Include="$(MSBuildProjectDirectory)/src/%(BuiltProjects.Identity)/bin/x86/$(Configuration)/net452/*.dll">
+            <BinaryFiles Include="$(MSBuildProjectDirectory)/src/%(BuiltProjects.Identity)/bin/x86/$(Configuration)/$(TargetFrameworkId)/*.dll">
                 <Dest>$(TempFolder)/bin32</Dest>
             </BinaryFiles>
         </ItemGroup>
@@ -100,7 +101,7 @@
         <Copy SourceFiles="$(MSBuildProjectDirectory)\install\opm.bat" DestinationFolder="%(BinaryFiles.Dest)"/>
 
         <PropertyGroup>
-            <DebugSrc>$(MSBuildProjectDirectory)/src/VSCode.DebugAdapter/bin/$(Configuration)/net452</DebugSrc>
+            <DebugSrc>$(MSBuildProjectDirectory)/src/VSCode.DebugAdapter/bin/$(Configuration)/$(TargetFrameworkId)</DebugSrc>
         </PropertyGroup>
         <ItemGroup>
             <DbgBinFiles Include="$(DebugSrc)/*.dll"/>

diff --git a/src/ASPNETHandler/HTTPServices.csproj b/src/ASPNETHandler/HTTPServices.csproj
@@ -5,7 +5,7 @@
         <AssemblyName>ASPNETHandler</AssemblyName>
         <AssemblyTitle>HTTP services for 1Script</AssemblyTitle>
         <RootNamespace>ASPNETHandler</RootNamespace>
-        <TargetFramework>net452</TargetFramework>
+        <TargetFramework>$(TargetFrameworkId)</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
       <Compile Remove="AspNetGlobalContextFunctions.cs" />

diff --git a/src/Component/Component.csproj b/src/Component/Component.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
 
   <PropertyGroup>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFramework>$(TargetFrameworkId)</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>

diff --git a/src/OneScript.DebugProtocol/OneScript.DebugProtocol.csproj b/src/OneScript.DebugProtocol/OneScript.DebugProtocol.csproj
@@ -7,11 +7,11 @@
     <Configurations>Debug;Release</Configurations>
     <AssemblyTitle>1Script Debug Protocol common objects and DTO's</AssemblyTitle>
     <Platforms>AnyCPU</Platforms>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworkId);netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="System.ServiceModel" Condition="'$(TargetFramework)' == 'net452'" />
+    <Reference Include="System.ServiceModel" Condition="'$(TargetFramework)' == '$(TargetFrameworkId)'" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

diff --git a/src/OneScript.DebugServices/OneScript.DebugServices.csproj b/src/OneScript.DebugServices/OneScript.DebugServices.csproj
@@ -2,7 +2,7 @@
     <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
 
     <PropertyGroup>
-        <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>$(TargetFrameworkId);netstandard2.0</TargetFrameworks>
         <Title>Debug services for apps hosting 1script engine</Title>
         <Copyright>Copyright (c) 2020 EvilBeaver</Copyright>
     </PropertyGroup>

diff --git a/src/OneScript.Language/OneScript.Language.csproj b/src/OneScript.Language/OneScript.Language.csproj
@@ -2,7 +2,7 @@
   <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netstandard2.0;netstandard2.1;</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworkId);netstandard2.0;netstandard2.1;</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -17,7 +17,7 @@
     <PackageTags>BSL 1C 1Script OneScript</PackageTags>
   </PropertyGroup>
 
-  <Target Name="CopyToRunner" AfterTargets="Build" Condition="'$(TargetFramework)' == 'net452'">
+  <Target Name="CopyToRunner" AfterTargets="Build" Condition="'$(TargetFramework)' == '$(TargetFrameworkId)'">
     <Message Text="Copying StandaloneRunner resources" />
     <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(MSBuildProjectDirectory)\..\StandaloneRunner\" />
   </Target>

diff --git a/src/OneScriptDocumenter/OneScriptDocumenter.csproj b/src/OneScriptDocumenter/OneScriptDocumenter.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
 
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFramework>$(TargetFrameworkId)</TargetFramework>
     <OutputType>Exe</OutputType>
     <Authors />
     <Product>OneScript Libraries Documenter</Product>

diff --git a/src/ScriptEngine.HostedScript/ScriptEngine.HostedScript.csproj b/src/ScriptEngine.HostedScript/ScriptEngine.HostedScript.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
   <PropertyGroup>
-    <TargetFrameworks>net452;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworkId);netstandard2.0;netstandard2.1</TargetFrameworks>
     <Configurations>Debug;Release</Configurations>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
@@ -26,11 +26,11 @@
     <PackageCopyright>OneScript OpenSource Community 2015</PackageCopyright>
     <PackageTags>BSL 1C 1Script OneScript</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Release|net452'">
-    <DocumentationFile>bin\Release\net452\ScriptEngine.HostedScript.xml</DocumentationFile>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Release|$(TargetFrameworkId)'">
+    <DocumentationFile>bin\Release\$(TargetFrameworkId)\ScriptEngine.HostedScript.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
-  <Target Name="CopyToRunner" AfterTargets="Build" Condition="'$(TargetFramework)' == 'net452'">
+  <Target Name="CopyToRunner" AfterTargets="Build" Condition="'$(TargetFramework)' == '$(TargetFrameworkId)'">
     <Message Text="Copying StandaloneRunner resources" />
     <ItemGroup>
       <CopyToStandalone Include="$(TargetPath)" />

diff --git a/src/ScriptEngine.NativeApi/ScriptEngine.NativeApi.vcxproj b/src/ScriptEngine.NativeApi/ScriptEngine.NativeApi.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -73,22 +74,22 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\x86\$(Configuration)\net452\</OutDir>
+    <OutDir>$(ProjectDir)bin\x86\$(Configuration)\$(TargetFrameworkId)\</OutDir>
     <TargetName>$(ProjectName)32</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\x86\$(Configuration)\net452\</OutDir>
+    <OutDir>$(ProjectDir)bin\x86\$(Configuration)\$(TargetFrameworkId)\</OutDir>
     <TargetName>$(ProjectName)32</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)\bin\$(Configuration)\net452\</OutDir>
+    <OutDir>$(ProjectDir)\bin\$(Configuration)\$(TargetFrameworkId)\</OutDir>
     <TargetName>$(ProjectName)64</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)\bin\$(Configuration)\net452\</OutDir>
+    <OutDir>$(ProjectDir)\bin\$(Configuration)\$(TargetFrameworkId)\</OutDir>
     <TargetName>$(ProjectName)64</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/src/ScriptEngine/ScriptEngine.csproj b/src/ScriptEngine/ScriptEngine.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworkId);netstandard2.0;netstandard2.1</TargetFrameworks>
     <Configurations>Debug;Release</Configurations>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
@@ -21,8 +21,8 @@
     <PackageTags>BSL 1C 1Script OneScript</PackageTags>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net452|AnyCPU'">
-    <DocumentationFile>bin\Release\net452\ScriptEngine.xml</DocumentationFile>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|$(TargetFrameworkId)|AnyCPU'">
+    <DocumentationFile>bin\Release\$(TargetFrameworkId)\ScriptEngine.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
 
@@ -31,10 +31,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="CustomMarshalers" Condition="'$(TargetFramework)' == 'net452'" />
+    <Reference Include="CustomMarshalers" Condition="'$(TargetFramework)' == '$(TargetFrameworkId)'" />
   </ItemGroup>
 
-  <Target Name="CopyToRunner" AfterTargets="Build" Condition="'$(TargetFramework)' == 'net452'">
+  <Target Name="CopyToRunner" AfterTargets="Build" Condition="'$(TargetFramework)' == '$(TargetFrameworkId)'">
     <Message Text="Copying StandaloneRunner resources" />
     <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(MSBuildProjectDirectory)\..\StandaloneRunner\" />
   </Target>

diff --git a/src/StandaloneRunner/StandaloneRunner.csproj b/src/StandaloneRunner/StandaloneRunner.csproj
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
   <PropertyGroup>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFramework>$(TargetFrameworkId)</TargetFramework>
     <Platforms>AnyCPU;x86</Platforms>
     <Configurations>Debug;Release</Configurations>
     <ApplicationIcon />
@@ -37,7 +38,7 @@
     <Delete Files="@(EmbeddedResource)" />
   </Target>
 
-  <Target Name="CopyToOscript" AfterTargets="Build" Condition="'$(TargetFramework)' == 'net452'">
+  <Target Name="CopyToOscript" AfterTargets="Build">
     <Message Text="Copying StandaloneRunner output" />
     <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(SolutionDir)oscript\" />
   </Target>

diff --git a/src/TestApp/TestApp.csproj b/src/TestApp/TestApp.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
 
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFramework>$(TargetFrameworkId)</TargetFramework>
     <!--LanguageTargets>$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets-->
     <ApplicationIcon>logo.ico</ApplicationIcon>
     <OutputType>WinExe</OutputType>

diff --git a/src/VSCode.DebugAdapter/VSCode.DebugAdapter.csproj b/src/VSCode.DebugAdapter/VSCode.DebugAdapter.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
 
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFramework>$(TargetFrameworkId)</TargetFramework>
     <OutputType>Exe</OutputType>
     <StartupObject>VSCode.DebugAdapter.Program</StartupObject>
     <Configurations>Debug;Release</Configurations>

diff --git a/src/oscommon.targets b/src/oscommon.targets
@@ -8,6 +8,7 @@
         <Configuration Condition="'$(Release)' == ''">Release</Configuration>
         <Platform Condition="'$(Platform)' == ''">x86</Platform>
         <LangVersion>7.3</LangVersion>
+        <TargetFrameworkId Condition="'$(TargetFrameworkId)' == ''">net462</TargetFrameworkId>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/src/oscript/oscript.csproj b/src/oscript/oscript.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
 
   <PropertyGroup>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFramework>$(TargetFrameworkId)</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <StartupObject>oscript.Program</StartupObject>
@@ -16,20 +16,15 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <DebugType></DebugType>
-    <DocumentationFile>bin\x86\Debug\net452\oscript.xml</DocumentationFile>
+    <DocumentationFile>bin\x86\Debug\$(TargetFrameworkId)\oscript.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>false</DebugSymbols>
-    <DebugType></DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\x86\Debug</OutputPath>
-    <DefineConstants></DefineConstants>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile></DocumentationFile>
     <PlatformTarget>x86</PlatformTarget>
     <IntermediateOutputPath>obj\x86\Debug</IntermediateOutputPath>
-    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />