Update target framework in csprojs to net5.0

Also moved target framework to central msbuild props file to make later updates easier
QutEcoacoustics · Dec 1, 2020 · 7c07092 · 7c07092
1 parent 4a657be
commit 7c07092
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 20 deletions.
diff --git a/AudioAnalysis.sln b/AudioAnalysis.sln
@@ -48,6 +48,24 @@ EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "AED.Test", "tests\AED.Test\AED.Test.fsproj", "{007BCD6A-6381-42D7-B5BB-61D07D54A311}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{B3123A8D-7CA1-464F-8E3F-1736B570351E}"
+	ProjectSection(SolutionItems) = preProject
+		build\azure-pipelines-build.yml = build\azure-pipelines-build.yml
+		build\azure-pipelines-dependencies-linux.yml = build\azure-pipelines-dependencies-linux.yml
+		build\azure-pipelines-release.yml = build\azure-pipelines-release.yml
+		build\build_docker.ps1 = build\build_docker.ps1
+		build\Dockerfile = build\Dockerfile
+		build\dotnet-install.ps1 = build\dotnet-install.ps1
+		build\dotnet-install.sh = build\dotnet-install.sh
+		build\download_ap.ps1 = build\download_ap.ps1
+		build\download_ap.Tests.ps1 = build\download_ap.Tests.ps1
+		build\generate_docs.ps1 = build\generate_docs.ps1
+		build\package.ps1 = build\package.ps1
+		build\publish_docs.ps1 = build\publish_docs.ps1
+		build\README.md = build\README.md
+		build\release_notes.ps1 = build\release_notes.ps1
+		build\set_permissions.ps1 = build\set_permissions.ps1
+		build\update_audio_utils.ps1 = build\update_audio_utils.ps1
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,10 +5,11 @@
     <!--<DotnetFscCompilerPath></DotnetFscCompilerPath>-->
     <!-- all of these are 64 bit except for linux-arm -->
     <RuntimeIdentifiers>win-x64;win-arm64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;osx-x64</RuntimeIdentifiers>
-    <Deterministic>true</Deterministic>
     <!--<DocumentationMode>Diagnose</DocumentationMode>-->
     <!--Enable xml documentation output for everything -->
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <TargetFramework>net5.0</TargetFramework>
+    <!--<LangVersion></LangVersion>-->
   </PropertyGroup>
   <PropertyGroup
     Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">

diff --git a/src/AED/AED.fsproj b/src/AED/AED.fsproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-      <TargetFramework>netcoreapp3.1</TargetFramework>
       <RootNamespace>Acoustics.AED</RootNamespace>
       <AssemblyName>Acoustics.AED</AssemblyName>
       <Name>AED</Name>

diff --git a/src/AcousticWorkbench/AcousticWorkbench.csproj b/src/AcousticWorkbench/AcousticWorkbench.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputPath>bin\$(Configuration)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/src/Acoustics.Shared.FSharp/Acoustics.Shared.FSharp.fsproj b/src/Acoustics.Shared.FSharp/Acoustics.Shared.FSharp.fsproj
@@ -2,7 +2,6 @@
     <PropertyGroup>
         <RootNamespace>Acoustics.Shared.FSharp</RootNamespace>
         <AssemblyName>Acoustics.Shared.FSharp</AssemblyName>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
         <Name>Acoustics.Shared.FSharp</Name>
         <Deterministic>true</Deterministic>
     </PropertyGroup>

diff --git a/src/Acoustics.Shared/Acoustics.Shared.csproj b/src/Acoustics.Shared/Acoustics.Shared.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyTitle>Acoustics.Shared</AssemblyTitle>
-    <LangVersion>8</LangVersion>
     <!-- TODO CORE: For log4net -->
     <NoWarn>$(NoWarn);NU1605</NoWarn>
   </PropertyGroup>

diff --git a/src/Acoustics.Tools/Acoustics.Tools.csproj b/src/Acoustics.Tools/Acoustics.Tools.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyTitle>Acoustics.Tools</AssemblyTitle>
     <OutputPath>bin\$(Configuration)\</OutputPath>
   </PropertyGroup>

diff --git a/src/AnalysisBase/AnalysisBase.csproj b/src/AnalysisBase/AnalysisBase.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyTitle>AnalysisBase</AssemblyTitle>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/src/AnalysisPrograms/AnalysisPrograms.csproj b/src/AnalysisPrograms/AnalysisPrograms.csproj
@@ -1,11 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProductVersion>9.0.30729</ProductVersion>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <StartupObject>AnalysisPrograms.MainEntry</StartupObject>
     <GenerateManifests>false</GenerateManifests>
-    <LangVersion>8</LangVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 

diff --git a/src/AudioAnalysisTools/AudioAnalysisTools.csproj b/src/AudioAnalysisTools/AudioAnalysisTools.csproj
@@ -1,6 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyTitle>AudioAnalysisTools</AssemblyTitle>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/src/TowseyLibrary/TowseyLibrary.csproj b/src/TowseyLibrary/TowseyLibrary.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyTitle>TowseyLib</AssemblyTitle>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/tests/AED.Test/AED.Test.fsproj b/tests/AED.Test/AED.Test.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <UseStandardResourceNames>true</UseStandardResourceNames>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <Name>AED.Test</Name>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/tests/Acoustics.Test/Acoustics.Test.csproj b/tests/Acoustics.Test/Acoustics.Test.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <AssemblyTitle>Acoustics.Test</AssemblyTitle>
     <Product>Acoustics.Test</Product>
-    <LangVersion>8</LangVersion>
+
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <RunSettingsFilePath>$(MSBuildThisFileDirectory).runsettings</RunSettingsFilePath>
     <!-- No consumers for our test docs, so don't generate them. -->