Remove comboprovider, upgrade, etc.

Author: cartermp

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "5.243.0",
+      "version": "5.249.0",
       "commands": [
         "paket"
       ]
     },
     "fake-cli": {
-      "version": "5.19.1",
+      "version": "5.20.1",
       "commands": [
         "fake"
       ]

.github/workflows/main.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, macOS-latest, ubuntu-latest]
-        dotnet: [3.1.201]
+        dotnet: [3.1.302]
     runs-on: ${{ matrix.os }}
 
     steps:

FSharp.TypeProviders.SDK.sln

@@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{E5
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "BasicProvider.DesignTime", "examples\BasicProvider.DesignTime\BasicProvider.DesignTime.fsproj", "{8A9470AA-303A-40D3-813C-1B6563EDB573}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ComboProvider", "examples\ComboProvider\ComboProvider.fsproj", "{E1762555-BA7F-4E6A-A2ED-CE7977494563}"
-EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "StressProvider", "examples\StressProvider\StressProvider.fsproj", "{D9D3ED64-F4E3-4DCC-BD34-368BD9170F89}"
 EndProject
 Global
@@ -42,10 +40,6 @@ Global
 		{8A9470AA-303A-40D3-813C-1B6563EDB573}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A9470AA-303A-40D3-813C-1B6563EDB573}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A9470AA-303A-40D3-813C-1B6563EDB573}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1762555-BA7F-4E6A-A2ED-CE7977494563}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1762555-BA7F-4E6A-A2ED-CE7977494563}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1762555-BA7F-4E6A-A2ED-CE7977494563}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1762555-BA7F-4E6A-A2ED-CE7977494563}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D9D3ED64-F4E3-4DCC-BD34-368BD9170F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D9D3ED64-F4E3-4DCC-BD34-368BD9170F89}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9D3ED64-F4E3-4DCC-BD34-368BD9170F89}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -57,7 +51,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{5EF9FF95-1C75-458A-983A-168E43945914} = {E5E5268B-0B72-41FE-9747-5CEBEE3EB161}
 		{8A9470AA-303A-40D3-813C-1B6563EDB573} = {E5E5268B-0B72-41FE-9747-5CEBEE3EB161}
-		{E1762555-BA7F-4E6A-A2ED-CE7977494563} = {E5E5268B-0B72-41FE-9747-5CEBEE3EB161}
 		{D9D3ED64-F4E3-4DCC-BD34-368BD9170F89} = {E5E5268B-0B72-41FE-9747-5CEBEE3EB161}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

README.md

@@ -266,5 +266,6 @@ The library is available under the MIT License. For more information see the [Li
 - [@mavnn](https://github.com/mavnn)
 - [@ovatsus](https://github.com/ovatsus)
 - [@dsyme](https://github.com/dsyme)
+- [@cartermp](https://github.com/cartermp)
 
 The default maintainer account for projects under "fsprojects" is [@fsprojectsgit](https://github.com/fsprojectsgit) - F# Community Project Incubation Space (repo management)

build.fsx

@@ -49,7 +49,6 @@ Target.create "Build" (fun _ ->
 Target.create "Examples" (fun _ ->
     DotNet.build setParams "examples/BasicProvider.DesignTime/BasicProvider.DesignTime.fsproj"
     DotNet.build setParams "examples/BasicProvider/BasicProvider.fsproj"
-    DotNet.build setParams "examples/ComboProvider/ComboProvider.fsproj"
     DotNet.build setParams "examples/StressProvider/StressProvider.fsproj"
 )
 
@@ -60,7 +59,6 @@ Target.create "RunTests" (fun _ ->
     [
         "tests/FSharp.TypeProviders.SDK.Tests.fsproj"
         "examples/BasicProvider.Tests/BasicProvider.Tests.fsproj"
-        "examples/ComboProvider.Tests/ComboProvider.Tests.fsproj"
         "examples/StressProvider.Tests/StressProvider.Tests.fsproj"
     ]
     |> List.iter (fun fsproj ->
@@ -86,14 +84,13 @@ Target.create "Pack" (fun _ ->
             } 
         }) "src/FSharp.TypeProviders.SDK.fsproj"
     DotNet.pack setParams "examples/BasicProvider/BasicProvider.fsproj"
-    DotNet.pack setParams "examples/ComboProvider/ComboProvider.fsproj"
     DotNet.pack setParams "examples/StressProvider/StressProvider.fsproj"
 
     NuGet.NuGet.NuGetPack (fun p -> {
         p with 
-            WorkingDir="templates"
-            OutputPath=outputPath
-            Version=release.NugetVersion
+            WorkingDir = "templates"
+            OutputPath = outputPath
+            Version = release.NugetVersion
             ReleaseNotes = releaseNotes
     }) "templates/FSharp.TypeProviders.Templates.nuspec"
 )