TargetFrameworkVersion will be embedded in .*proj files instead of xb…

…uild calls
esa · Jan 21, 2020 · 9214725 · 9214725
1 parent 0794981
commit 9214725
Show file tree

Hide file tree

Showing 22 changed files with 48 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,4 +2,4 @@ os: osx
 language: csharp
 script: 
   - nuget restore
-  - xbuild /p:TargetFrameworkVersion="v4.5"
+  - xbuild
diff --git a/Antlr/Antlr.csproj b/Antlr/Antlr.csproj
@@ -10,10 +10,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Antlr</RootNamespace>
     <AssemblyName>Antlr</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Asn1f4/App.config b/Asn1f4/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.0" />
-    </startup>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
 </configuration>
diff --git a/Asn1f4/Asn1f4.fsproj b/Asn1f4/Asn1f4.fsproj
@@ -9,12 +9,13 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Asn1f4</RootNamespace>
     <AssemblyName>Asn1f4</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>Asn1f4</Name>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/BackendAst/BackendAst.fsproj b/BackendAst/BackendAst.fsproj
@@ -9,11 +9,12 @@
     <OutputType>Library</OutputType>
     <RootNamespace>BackendAst</RootNamespace>
     <AssemblyName>BackendAst</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>BackendAst</Name>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/CommonTypes/CommonTypes.fsproj b/CommonTypes/CommonTypes.fsproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>CommonTypes</RootNamespace>
     <AssemblyName>CommonTypes</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>CommonTypes</Name>

diff --git a/Daemon.ExampleClient/App.config b/Daemon.ExampleClient/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.6.1" />
-    </startup>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
 </configuration>
diff --git a/Daemon.ExampleClient/Daemon.ExampleClient.fsproj b/Daemon.ExampleClient/Daemon.ExampleClient.fsproj
@@ -9,11 +9,12 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Daemon.ExampleClient</RootNamespace>
     <AssemblyName>Daemon.ExampleClient</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <UseStandardResourceNames>true</UseStandardResourceNames>
-    <TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
+    <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <Name>Daemon.ExampleClient</Name>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Daemon/App.config b/Daemon/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
 </configuration>
diff --git a/Daemon/Daemon.fsproj b/Daemon/Daemon.fsproj
@@ -9,11 +9,12 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Daemon</RootNamespace>
     <AssemblyName>Daemon</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <UseStandardResourceNames>true</UseStandardResourceNames>
     <TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
     <Name>Daemon</Name>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Dockerfile.runtime b/Dockerfile.runtime
@@ -17,8 +17,8 @@ RUN set -ex ;\
     git clone https://github.com/ttsiodras/asn1scc.git ;\
     cd asn1scc/ ;\
     nuget restore ;\
-    xbuild /p:TargetFrameworkVersion="v4.5" ;\
-    xbuild /p:Configuration=Release /p:TargetFrameworkVersion="v4.5" ;\
+    xbuild ;\
+    xbuild /p:Configuration=Release ;\
     cd /tmp ;\
     mkdir asn1install ;\
     cd asn1install ;\

diff --git a/FrontEndAst/FrontEndAst.fsproj b/FrontEndAst/FrontEndAst.fsproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>FrontEndAst</RootNamespace>
     <AssemblyName>FrontEndAst</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>FrontEndAst</Name>

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 all:
 	nuget restore
-	xbuild /p:TargetFrameworkVersion="v4.5" || exit 1
+	xbuild || exit 1
 	chmod +x Asn1f?/bin/Debug/*.exe
 	rm -f Asn1f4/bin/Debug/asn1.exe 
 	cp Asn1f4/bin/Debug/Asn1f4.exe Asn1f4/bin/Debug/asn1.exe 
diff --git a/Makefile.Release b/Makefile.Release
@@ -1,6 +1,6 @@
 all:
 	nuget restore
-	xbuild /p:Configuration=Release /p:TargetFrameworkVersion="v4.5" || exit 1
+	xbuild /p:Configuration=Release || exit 1
 	chmod +x Asn1f?/bin/Release/*.exe
 	rm -f Asn1f4/bin/Release/asn1.exe 
 	cp Asn1f4/bin/Release/Asn1f4.exe Asn1f4/bin/Release/asn1.exe 
diff --git a/ST/ST.fsproj b/ST/ST.fsproj
@@ -11,9 +11,10 @@
     <RootNamespace>ST</RootNamespace>
     <AssemblyName>ST</AssemblyName>
     <Name>ST</Name>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,4 +96,4 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
-</Project>
+</Project>
diff --git a/Service.Implementation/Service.Implementation.fsproj b/Service.Implementation/Service.Implementation.fsproj
@@ -10,10 +10,11 @@
     <RootNamespace>Service.Implementation</RootNamespace>
     <AssemblyName>Service.Implementation</AssemblyName>
     <UseStandardResourceNames>true</UseStandardResourceNames>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>Service.Implementation</Name>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Service/Service.fsproj b/Service/Service.fsproj
@@ -10,10 +10,11 @@
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
     <UseStandardResourceNames>true</UseStandardResourceNames>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>Service</Name>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/StgAda/StgAda.fsproj b/StgAda/StgAda.fsproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>StgAda</RootNamespace>
     <AssemblyName>StgAda</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>StgAda</Name>

diff --git a/StgC/StgC.fsproj b/StgC/StgC.fsproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>StgC</RootNamespace>
     <AssemblyName>StgC</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>StgC</Name>

diff --git a/StgVarious/StgVarious.fsproj b/StgVarious/StgVarious.fsproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>StgVarious</RootNamespace>
     <AssemblyName>StgVarious</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>StgVarious</Name>

diff --git a/parseStg2/app.config b/parseStg2/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/parseStg2/parseStg2.csproj b/parseStg2/parseStg2.csproj
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>parseStg2</RootNamespace>
     <AssemblyName>parseStg2</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -44,6 +45,9 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.