Convert to NuGet CPM.

mta-solutions · Nov 14, 2023 · b93f414 · b93f414
1 parent b426995
commit b93f414
Show file tree

Hide file tree

Showing 25 changed files with 1,328 additions and 721 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
diff --git a/.github/workflows/giraffe-release.yml b/.github/workflows/giraffe-release.yml
@@ -0,0 +1,43 @@
+on:
+  push:
+    tags:
+    - "giraffe-v[0-9]+.[0-9]+.[0-9]+"
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Verify commit exists in origin/main
+        run: |
+          git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
+          git branch --remote --contains | grep origin/main
+
+      - name: Set VERSION variable from tag
+        run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Install .NET dependencies
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet build --configuration Release /p:NuGetVersion=${VERSION}
+
+      - name: Test
+        run: dotnet test --configuration Release /p:NuGetVersion=${VERSION} --no-build --verbosity normal
+
+      - name: Pack
+        run: dotnet pack --configuration Release /p:NuGetVersion=${VERSION} /p:PackageVersion=${VERSION} --output .
+
+      - name: Push
+        run: dotnet nuget push FSharp.Data.Validation.Giraffe.${VERSION}.nupkg --source https://api.nuget.org/v3/index.json --api-key ${AMPERSAND_NUGET_KEY} --symbol-source https://symbols.nuget.org/download/symbols --symbol-api-key ${AMPERSAND_NUGET_KEY} 
+
+        env:
+          AMPERSAND_NUGET_KEY: ${{ secrets.AMPERSAND_NUGET_KEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,13 +22,10 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
-
-      - name: Restore .NET tools
-        run: dotnet tool restore
+          dotnet-version: 8.0.x
 
       - name: Install .NET dependencies
-        run: dotnet paket install
+        run: dotnet restore
 
       - name: Build
         run: dotnet build --configuration Release /p:NuGetVersion=${VERSION}
@@ -37,10 +34,10 @@ jobs:
         run: dotnet test --configuration Release /p:NuGetVersion=${VERSION} --no-build --verbosity normal
 
       - name: Pack
-        run: dotnet pack --configuration Release /p:NuGetVersion=${VERSION} /p:PackageVersion=${VERSION} --output .
+        run: dotnet pack --configuration Release /p:NuGetVersion=${VERSION} /p:PackageVersion=${VERSION} --include-symbols --output .
 
       - name: Push
-        run: dotnet nuget push FSharp.Data.Validation.${VERSION}.nupkg --source https://api.nuget.org/v3/index.json --api-key ${AMPERSAND_NUGET_KEY}
+        run: dotnet nuget push FSharp.Data.Validation.${VERSION}.nupkg --source https://api.nuget.org/v3/index.json --api-key ${AMPERSAND_NUGET_KEY} --symbol-source https://symbols.nuget.org/download/symbols --symbol-api-key ${AMPERSAND_NUGET_KEY} 
 
         env:
           AMPERSAND_NUGET_KEY: ${{ secrets.AMPERSAND_NUGET_KEY }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,13 +17,10 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
-
-      - name: Restore .NET tools
-        run: dotnet tool restore
+          dotnet-version: 8.0.x
 
       - name: Install .NET dependencies
-        run: dotnet paket install
+        run: dotnet restore
 
       - name: Build .NET
         run: dotnet build

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/pack.ps1 b/pack.ps1
@@ -0,0 +1,5 @@
+dotnet restore
+dotnet build --configuration Release
+Remove-Item .\packages\*.nupkg
+Remove-Item .\packages\*.snupkg
+dotnet pack -o .\packages -c Release --include-symbols
diff --git a/paket.dependencies b/paket.dependencies
diff --git a/paket.lock b/paket.lock
diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props
@@ -0,0 +1,10 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="FSharp.Core" Version="[6,)" />
+  </ItemGroup>
+</Project>
diff --git a/samples/FSharp.Data.Validation.Samples/FSharp.Data.Validation.Samples.fsproj b/samples/FSharp.Data.Validation.Samples/FSharp.Data.Validation.Samples.fsproj
@@ -1,19 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <None Include="paket.references" />
-        <Compile Include="Primitives.fs" />
-        <Compile Include="ComplexTypes.fs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Primitives.fs" />
+    <Compile Include="ComplexTypes.fs" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\src\FSharp.Data.Validation\FSharp.Data.Validation.fsproj" />
-    </ItemGroup>
-    <Import Project="..\..\.paket\Paket.Restore.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\FSharp.Data.Validation\FSharp.Data.Validation.fsproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="FSharp.Core" />
+  </ItemGroup>
 
 </Project>
diff --git a/samples/FSharp.Data.Validation.Samples/packages.lock.json b/samples/FSharp.Data.Validation.Samples/packages.lock.json
@@ -0,0 +1,32 @@
+{
+  "version": 2,
+  "dependencies": {
+    "net6.0": {
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
+      },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.0.0",
+          "Microsoft.SourceLink.Common": "1.0.0"
+        }
+      },
+      "fsharp.data.validation": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.SourceLink.GitHub": "[1.0.0, )"
+        }
+      }
+    }
+  }
+}
diff --git a/samples/FSharp.Data.Validation.Samples/paket.references b/samples/FSharp.Data.Validation.Samples/paket.references
diff --git a/samples/GettingStarted/GettingStarted.fsproj b/samples/GettingStarted/GettingStarted.fsproj
@@ -4,11 +4,13 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="paket.references" />
     <Compile Include="Types.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\FSharp.Data.Validation\FSharp.Data.Validation.fsproj" />
   </ItemGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
+
+  <ItemGroup>
+    <PackageReference Update="FSharp.Core" />
+  </ItemGroup>
 </Project>
diff --git a/samples/GettingStarted/packages.lock.json b/samples/GettingStarted/packages.lock.json
@@ -0,0 +1,32 @@
+{
+  "version": 2,
+  "dependencies": {
+    "net6.0": {
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
+      },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.0.0",
+          "Microsoft.SourceLink.Common": "1.0.0"
+        }
+      },
+      "fsharp.data.validation": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.SourceLink.GitHub": "[1.0.0, )"
+        }
+      }
+    }
+  }
+}
diff --git a/samples/GettingStarted/paket.references b/samples/GettingStarted/paket.references
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <Authors>Matanuska Telecom Association</Authors>
+    <Company>Matanuska Telecom Association</Company>
+    <WarningsAsErrors>FS0025</WarningsAsErrors>
+    <!-- See: https://github.com/dotnet/sourcelink/ -->
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/alasconnect/fsharp-data-validation</RepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" />
+  </ItemGroup>
+</Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="FSharp.Core" Version="[6.0.1,)" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="[1,)" />
+
+    <PackageVersion Include="Giraffe" Version="[6,)" />
+  </ItemGroup>
+</Project>
diff --git a/src/FSharp.Data.Validation.Giraffe/FSharp.Data.Validation.Giraffe.fsproj b/src/FSharp.Data.Validation.Giraffe/FSharp.Data.Validation.Giraffe.fsproj
@@ -4,12 +4,9 @@
     <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Model validation helpers for Giraffe.</Description>
-    <Company>Matanuska Telecom Association</Company>
-    <Authors>Matanuska Telecom Association</Authors>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/alasconnect/fsharp-data-validation</RepositoryUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <Version>0.0.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Library.fs" />
@@ -21,7 +18,10 @@
       <Pack>false</Pack>
       <PackagePath>\</PackagePath>
     </None>
-    <None Include="paket.references" />
   </ItemGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
+
+  <ItemGroup>
+    <PackageReference Update="FSharp.Core" />
+    <PackageReference Include="Giraffe" />
+  </ItemGroup>
 </Project>
diff --git a/src/FSharp.Data.Validation.Giraffe/paket.references b/src/FSharp.Data.Validation.Giraffe/paket.references