From a26401758a64e3a69324c68fcaedb99f000bbfbf Mon Sep 17 00:00:00 2001
From: Dave Curylo <dave@curylo.org>
Date: Thu, 1 Dec 2022 09:15:07 -0500
Subject: [PATCH] Nuget package deterministic builds

---
 .github/workflows/build-and-test.yml   |  2 +-
 .github/workflows/pack-and-publish.yml |  8 +++++---
 src/FSharp.Text.Docker.fsproj          | 18 +++++++++++++-----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 2831fed..6a3abd5 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.300
+        dotnet-version: 6.0.403
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
diff --git a/.github/workflows/pack-and-publish.yml b/.github/workflows/pack-and-publish.yml
index 8f7f845..af1d7aa 100644
--- a/.github/workflows/pack-and-publish.yml
+++ b/.github/workflows/pack-and-publish.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.300
+          dotnet-version: 6.0.403
       - name: Restore dependencies
         run: dotnet restore
       - name: Build
@@ -24,5 +24,7 @@ jobs:
         run: dotnet test --no-build --verbosity normal
       - name: Pack
         run: VERSION=${GITHUB_REF##*/} dotnet pack -o . -c Release
-      - name: Publish
-        run: dotnet nuget push FSharp.Text.Docker.*.nupkg -s https://nuget.org -k ${{ secrets.NUGET_API_KEY }}
\ No newline at end of file
+      - name: Publish nuget package
+        run: dotnet nuget push FSharp.Text.Docker.*.nupkg -s https://nuget.org -k ${{ secrets.NUGET_API_KEY }}
+      - name: Publish symbols package
+        run: dotnet nuget push FSharp.Text.Docker.*.snupkg -s https://nuget.org -k ${{ secrets.NUGET_API_KEY }}
diff --git a/src/FSharp.Text.Docker.fsproj b/src/FSharp.Text.Docker.fsproj
index 6e9c048..6d27d29 100644
--- a/src/FSharp.Text.Docker.fsproj
+++ b/src/FSharp.Text.Docker.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Copyright>Copyright (c) 2017-2022 Dave Curylo</Copyright>
     <Description>Building Dockerfiles from F#.</Description>
@@ -8,6 +8,10 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageTags>docker;fsharp</PackageTags>
     <Authors>dcurylo</Authors>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Dockerfile.fs" />
@@ -16,12 +20,16 @@
     <None Include="../LICENSE" Pack="true" PackagePath="" />
     <None Include="../README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net6.0' ">
+  <!-- Set minimum dependency for FSharp.Core instead of using SDK dependency -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Update="FSharp.Core" Version="5.0.0" />
+    <PackageReference Include="System.Text.Json" Version="5.0.1" />
   </ItemGroup>
+  <!-- Enable SourceLink and deterministic builds -->
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.Text.Json" Version="5.0.1" />
-  </ItemGroup></Project>
+  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup> 
+</Project>