everything builds and targets net6

other notes: - editor made some whitespace cleanup, and I just committed them as-is - another web* -> httpclient update - broken tests are going to require some investigation; for now I just want to get some packages published that I can use - fake build script requires a specific, non-rolled-forward version of the .NET SDK; fixed in what will be FAKE 5.23.0, but see fsprojects/FAKE#2641
aggieben · Jul 11, 2022 · d1b22a2 · d1b22a2
1 parent 6be8ea1
commit d1b22a2
Show file tree

Hide file tree

Showing 14 changed files with 134 additions and 84 deletions.
diff --git a/MBrace.Core.sln b/MBrace.Core.sln
@@ -13,6 +13,20 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MBrace.Core.Tests", "tests\
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MBrace.Flow", "src\MBrace.Flow\MBrace.Flow.fsproj", "{5A6749B3-FE6B-454C-AB54-A04E34541B3E}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MBrace.Runtime", "src\MBrace.Runtime\MBrace.Runtime.fsproj", "{3A25C862-BD14-4E5A-8869-2B77857E9AED}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MBrace.Runtime.Tests", "tests\MBrace.Runtime.Tests\MBrace.Runtime.Tests.fsproj", "{F77F0CE1-7A05-424C-A305-5B44F04B835B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MBrace.CSharp", "src\MBrace.CSharp\MBrace.CSharp.csproj", "{9B348193-D37E-4ECE-8047-74270A79A56C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MBrace.CSharp.Tests", "tests\MBrace.CSharp.Tests\MBrace.CSharp.Tests.csproj", "{9A3BCF23-086F-4762-98DB-710CBBACEAC9}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MBrace.Thespian", "src\MBrace.Thespian\MBrace.Thespian.fsproj", "{CEA96F02-FC84-4A9C-9995-C5F720D09826}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MBrace.Thespian.Tests", "tests\MBrace.Thespian.Tests\MBrace.Thespian.Tests.fsproj", "{13B7D891-02BA-40F3-AFF1-896E9643B865}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MBrace.Thespian.Worker", "src\MBrace.Thespian.Worker\MBrace.Thespian.Worker.fsproj", "{14A7CE76-94B8-46EB-9C44-34B5BBD757D4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,10 +48,45 @@ Global
 		{5A6749B3-FE6B-454C-AB54-A04E34541B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5A6749B3-FE6B-454C-AB54-A04E34541B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A6749B3-FE6B-454C-AB54-A04E34541B3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A25C862-BD14-4E5A-8869-2B77857E9AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A25C862-BD14-4E5A-8869-2B77857E9AED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A25C862-BD14-4E5A-8869-2B77857E9AED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A25C862-BD14-4E5A-8869-2B77857E9AED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F77F0CE1-7A05-424C-A305-5B44F04B835B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F77F0CE1-7A05-424C-A305-5B44F04B835B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F77F0CE1-7A05-424C-A305-5B44F04B835B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F77F0CE1-7A05-424C-A305-5B44F04B835B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B348193-D37E-4ECE-8047-74270A79A56C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B348193-D37E-4ECE-8047-74270A79A56C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B348193-D37E-4ECE-8047-74270A79A56C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B348193-D37E-4ECE-8047-74270A79A56C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A3BCF23-086F-4762-98DB-710CBBACEAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A3BCF23-086F-4762-98DB-710CBBACEAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A3BCF23-086F-4762-98DB-710CBBACEAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A3BCF23-086F-4762-98DB-710CBBACEAC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CEA96F02-FC84-4A9C-9995-C5F720D09826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEA96F02-FC84-4A9C-9995-C5F720D09826}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEA96F02-FC84-4A9C-9995-C5F720D09826}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEA96F02-FC84-4A9C-9995-C5F720D09826}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13B7D891-02BA-40F3-AFF1-896E9643B865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13B7D891-02BA-40F3-AFF1-896E9643B865}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13B7D891-02BA-40F3-AFF1-896E9643B865}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13B7D891-02BA-40F3-AFF1-896E9643B865}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14A7CE76-94B8-46EB-9C44-34B5BBD757D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14A7CE76-94B8-46EB-9C44-34B5BBD757D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14A7CE76-94B8-46EB-9C44-34B5BBD757D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14A7CE76-94B8-46EB-9C44-34B5BBD757D4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{6F56D9AA-09C6-4602-BEC4-79469129464C} = {5B058E9C-F215-4C64-B120-E1B0B132920E}
 		{2BA4B2C5-F570-41D6-9F80-579499EAE9DA} = {4D1C70F7-C170-4256-B5F3-A7D7D822C828}
 		{5A6749B3-FE6B-454C-AB54-A04E34541B3E} = {5B058E9C-F215-4C64-B120-E1B0B132920E}
+		{3A25C862-BD14-4E5A-8869-2B77857E9AED} = {5B058E9C-F215-4C64-B120-E1B0B132920E}
+		{F77F0CE1-7A05-424C-A305-5B44F04B835B} = {4D1C70F7-C170-4256-B5F3-A7D7D822C828}
+		{9B348193-D37E-4ECE-8047-74270A79A56C} = {5B058E9C-F215-4C64-B120-E1B0B132920E}
+		{9A3BCF23-086F-4762-98DB-710CBBACEAC9} = {4D1C70F7-C170-4256-B5F3-A7D7D822C828}
+		{CEA96F02-FC84-4A9C-9995-C5F720D09826} = {5B058E9C-F215-4C64-B120-E1B0B132920E}
+		{13B7D891-02BA-40F3-AFF1-896E9643B865} = {4D1C70F7-C170-4256-B5F3-A7D7D822C828}
+		{14A7CE76-94B8-46EB-9C44-34B5BBD757D4} = {5B058E9C-F215-4C64-B120-E1B0B132920E}
 	EndGlobalSection
 EndGlobal
diff --git a/build.fsx b/build.fsx
@@ -1,5 +1,5 @@
 // --------------------------------------------------------------------------------------
-// FAKE build script 
+// FAKE build script
 // --------------------------------------------------------------------------------------
 
 #r "paket: groupref build //"
@@ -27,7 +27,7 @@ type TestCoverage =
     | All = 7
 
 module TestCoverage =
-    let parse(value : string) = 
+    let parse(value : string) =
         let ok, tc = Enum.TryParse<TestCoverage>(value, ignoreCase = true)
         if ok then tc else invalidArg value "invalid test coverage value"
 
@@ -50,6 +50,7 @@ let configuration () = Environment.environVarOrDefault "Configuration" "Release"
 let getTestCoverage () = Environment.environVarOrDefault "TestCoverage" "all" |> TestCoverage.parse
 
 let release = ReleaseNotes.load "RELEASE_NOTES.md"
+printfn "Release: %A" release
 
 // --------------------------------------------------------------------------------------
 // Clean and restore packages
@@ -62,9 +63,9 @@ Target.create "Clean" (fun _ ->
 // Build
 
 Target.create "Build" (fun _ ->
-    DotNet.build (fun opts -> 
-        { opts with 
-            Configuration = configuration() 
+    DotNet.build (fun opts ->
+        { opts with
+            Configuration = configuration()
 
             MSBuildParams =
                 { opts.MSBuildParams with
@@ -104,7 +105,7 @@ Target.create "NuGet.Pack" (fun _ ->
             Configuration = DotNet.BuildConfiguration.Release
             MSBuildParams =
                 { pack.MSBuildParams with
-                    Properties = 
+                    Properties =
                         [("Version", release.NugetVersion)
                          ("PackageReleaseNotes", releaseNotes)] }
         }) __SOURCE_DIRECTORY__
@@ -144,7 +145,7 @@ Target.create "ReleaseGitHub" (fun _ ->
 
     let client =
         match Environment.GetEnvironmentVariable "GITHUB_TOKEN" with
-        | null -> 
+        | null ->
             let user =
                 match Environment.environVarOrDefault "github-user" "" with
                 | s when not (String.IsNullOrWhiteSpace s) -> s

diff --git a/src/MBrace.CSharp/MBrace.CSharp.csproj b/src/MBrace.CSharp/MBrace.CSharp.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6</TargetFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>MBrace wrappers and utilities for C#</Description>

diff --git a/src/MBrace.Core/MBrace.Core.fsproj b/src/MBrace.Core/MBrace.Core.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6</TargetFrameworks>
+    <TargetFrameworks>net6</TargetFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>The MBrace core library contains all cloud computation essentials,

diff --git a/src/MBrace.Flow/MBrace.Flow.fsproj b/src/MBrace.Flow/MBrace.Flow.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6</TargetFrameworks>
+    <TargetFrameworks>net6</TargetFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>MBrace library for distributing flow computations.</Description>

diff --git a/src/MBrace.Runtime/MBrace.Runtime.fsproj b/src/MBrace.Runtime/MBrace.Runtime.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>

diff --git a/src/MBrace.Thespian.Worker/MBrace.Thespian.Worker.fsproj b/src/MBrace.Thespian.Worker/MBrace.Thespian.Worker.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AssemblyName>mbrace.thespian.worker</AssemblyName>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git a/src/MBrace.Thespian/MBrace.Thespian.fsproj b/src/MBrace.Thespian/MBrace.Thespian.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git a/tests/MBrace.CSharp.Tests/MBrace.CSharp.Tests.csproj b/tests/MBrace.CSharp.Tests/MBrace.CSharp.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\MBrace.Core\MBrace.Core.fsproj" />