Update multiple framework distribution method to match https://docs.m…

…icrosoft.com/en-us/dotnet/standard/net-standard
pjseoane · Sep 18, 2018 · 65dbdbb · 65dbdbb
1 parent 4f196fa
commit 65dbdbb
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 26 deletions.
diff --git a/AcceptanceTest/AcceptanceTest.csproj b/AcceptanceTest/AcceptanceTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 

diff --git a/AcceptanceTest/runat.ps1 b/AcceptanceTest/runat.ps1
@@ -13,7 +13,7 @@ Param(
     [string] $conf= "cfg\at.cfg", 
 
   [Parameter(Position=5)]
-    [string] $framework= "net452"
+    [string] $framework= "net461"
 )
 
 $result = 0
@@ -25,7 +25,7 @@ if([string]::IsNullOrEmpty($tests))
 }
 
 
-if(($configuration -ne "release" -And $configuration -ne "debug") -Or ($framework -ne "net452" -And $framework -ne "netcoreapp2.0"))
+if(($configuration -ne "release" -And $configuration -ne "debug") -Or ($framework -ne "net461" -And $framework -ne "netcoreapp2.0"))
 {
     Usage
 }
@@ -59,7 +59,7 @@ function StartTests
 
 function Usage
 {
-    echo "Usage: runat [release | debug] [port] [TESTFILE...] [net452|netcoreapp2.0]"
+    echo "Usage: runat [release | debug] [port] [TESTFILE...] [net461|netcoreapp2.0]"
     $script:result = 1
     Quit
 }

diff --git a/Examples/Executor/Examples.Executor.csproj b/Examples/Executor/Examples.Executor.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <RootNamespace>Executor</RootNamespace>
     <AssemblyName>Executor</AssemblyName>
     <Copyright>Copyright © Connamara Systems, LLC 2011</Copyright>

diff --git a/Examples/README.txt b/Examples/README.txt
@@ -16,8 +16,8 @@ TradeClient can also be configured to connect to SimpleAcceptor,
 though TradeClient will not hear any application-level responses from
 SimpleAcceptor.
 
-Each app is meant to be run from its target dir, e.g. Examples\Executor\bin\Debug\net452
-or Examples\Executor\bin\Debug\netcoreapp2.0. The instructions below assume net452, but
+Each app is meant to be run from its target dir, e.g. Examples\Executor\bin\Debug\net461
+or Examples\Executor\bin\Debug\netcoreapp2.0. The instructions below assume net461, but
 apply equally to netcoreapp2.0.
 
 
@@ -39,7 +39,7 @@ handle. For more information - http://quickfixn.org/tutorial/configuration
 
 Build QuickFIX/n first by running build.bat
 Then start the SimpleAcceptor by opening a command prompt at 
-quickfixn/Examples/SimpleAcceptor/bin/Release/net452 and running:
+quickfixn/Examples/SimpleAcceptor/bin/Release/net461 and running:
 Examples.SimpleAcceptor.exe simpleacc.cfg
 
 Executor
@@ -60,7 +60,7 @@ the counterparty will reject your message.
 The Executor is configured with the executor.cfg file.
 
 Build QuickFIX/n by running build.bat, then start the Executor by opening a command
-prompt at quickfixn/Examples/Executor/bin/Release/net452 and running:
+prompt at quickfixn/Examples/Executor/bin/Release/net461 and running:
 Executor.exe executor.cfg
 
 TradeClient
@@ -77,5 +77,5 @@ demonstration of how to complete certain tasks in your own application.
 TradeClient is configured with the tradeclient.cfg file.
 
 Build QuickFIX/n by running build.bat, then start TradeClient by opening a command
-prompt at quickfixn/Examples/TradeClient/bin/Release/net452 and running
+prompt at quickfixn/Examples/TradeClient/bin/Release/net461 and running
 TradeClient.exe tradeclient.cfg
diff --git a/Examples/SimpleAcceptor/Examples.SimpleAcceptor.csproj b/Examples/SimpleAcceptor/Examples.SimpleAcceptor.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <RootNamespace>SimpleAcceptor</RootNamespace>
     <AssemblyName>SimpleAcceptor</AssemblyName>
     <Copyright>Copyright © Connamara Systems, LLC 2011</Copyright>

diff --git a/Examples/TradeClient/Examples.TradeClient.csproj b/Examples/TradeClient/Examples.TradeClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <RootNamespace>TradeClient</RootNamespace>
     <AssemblyName>TradeClient</AssemblyName>
     <Copyright>Copyright © Connamara Systems, LLC 2011</Copyright>

diff --git a/RELEASE_README.md b/RELEASE_README.md
@@ -8,7 +8,7 @@ For more information, visit [http://www.quickfixn.org] (http://www.quickfixn.org
 
 Getting Started
 ===============
-Copy bin/net452/QuickFix.dll or bin/netstandard2.0/QuickFix.dll along with needed message assemblies into your .NET project.
+Copy bin/netstandard2.0/QuickFix.dll along with needed message assemblies into your .NET project.
 
 Then read the [documentation] (http://quickfixn.org/tutorial/creating-an-application)
 

diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>

diff --git a/acceptance_test.ps1 b/acceptance_test.ps1
@@ -79,7 +79,7 @@ Push-Location -Path "AcceptanceTest" -StackName AcceptanceTest
 
     Remove-Item AcceptanceTests_*.xml
 
-    RunSuite "release" "net452"
+    RunSuite "release" "net461"
 
     RunSuite "release" "netcoreapp2.0"
 

diff --git a/package_release.bat b/package_release.bat
@@ -50,22 +50,11 @@ IF EXIST tmp rmdir /s /q tmp
 mkdir tmp
 mkdir tmp\%QF_DIR%
 mkdir tmp\%QF_DIR%\bin
-mkdir tmp\%QF_DIR%\bin\net452
 mkdir tmp\%QF_DIR%\bin\netstandard2.0
 mkdir tmp\%QF_DIR%\spec
 mkdir tmp\%QF_DIR%\config
-copy QuickFIXn\bin\Release\net452\QuickFix.dll tmp\%QF_DIR%\bin\net452\QuickFix.dll
 copy QuickFIXn\bin\Release\netstandard2.0\QuickFix.dll tmp\%QF_DIR%\bin\netstandard2.0\QuickFix.dll
 
-copy Messages\FIX40\bin\Release\net452\QuickFix.FIX40.dll tmp\%QF_DIR%\bin\net452\QuickFix.FIX40.dll
-copy Messages\FIX41\bin\Release\net452\QuickFix.FIX41.dll tmp\%QF_DIR%\bin\net452\QuickFix.FIX41.dll
-copy Messages\FIX42\bin\Release\net452\QuickFix.FIX42.dll tmp\%QF_DIR%\bin\net452\QuickFix.FIX42.dll
-copy Messages\FIX43\bin\Release\net452\QuickFix.FIX43.dll tmp\%QF_DIR%\bin\net452\QuickFix.FIX43.dll
-copy Messages\FIX44\bin\Release\net452\QuickFix.FIX44.dll tmp\%QF_DIR%\bin\net452\QuickFix.FIX44.dll
-copy Messages\FIX50\bin\Release\net452\QuickFix.FIX50.dll tmp\%QF_DIR%\bin\net452\QuickFix.FIX50.dll
-copy Messages\FIX50SP1\bin\Release\net452\QuickFix.FIX50SP1.dll tmp\%QF_DIR%\bin\net452\QuickFix.FIX50SP1.dll
-copy Messages\FIX50SP2\bin\Release\net452\QuickFix.FIX50SP2.dll tmp\%QF_DIR%\bin\net452\QuickFix.FIX50SP2.dll
-
 copy Messages\FIX40\bin\Release\netstandard2.0\QuickFix.FIX40.dll tmp\%QF_DIR%\bin\netstandard2.0\QuickFix.FIX40.dll
 copy Messages\FIX41\bin\Release\netstandard2.0\QuickFix.FIX41.dll tmp\%QF_DIR%\bin\netstandard2.0\QuickFix.FIX41.dll
 copy Messages\FIX42\bin\Release\netstandard2.0\QuickFix.FIX42.dll tmp\%QF_DIR%\bin\netstandard2.0\QuickFix.FIX42.dll