SDK 6, ReproducibleBuilds

SDK 6.0.200 SourceLink -> DotNet.ReproducibleBuilds Warning Level 5
fsprojects · May 28, 2022 · f7a8b06 · f7a8b06
1 parent 5672673
commit f7a8b06
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 56 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,10 +12,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.100
     - name: Build
       run: .\build.cmd -t Bundle
 
@@ -24,6 +20,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: Build
       run: ./docker-build.sh -t Bundle
 
@@ -35,6 +35,6 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 6.0.x
     - name: Build
-      run: ./build.sh -t Bundle
+      run: ./build.sh -t Bundle
diff --git a/Argu.sln b/Argu.sln
@@ -2,40 +2,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27428.2002
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Argu", "src\Argu\Argu.fsproj", "{D3E958F9-5FFF-462E-BDC7-A03272A9F5D9}" 
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Argu", "src\Argu\Argu.fsproj", "{D3E958F9-5FFF-462E-BDC7-A03272A9F5D9}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Argu.Samples.LS", "samples\Argu.Samples.LS\Argu.Samples.LS.fsproj", "{E0563A30-4451-4DF2-9D21-26C76EB85C22}" 
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Argu.Samples.LS", "samples\Argu.Samples.LS\Argu.Samples.LS.fsproj", "{E0563A30-4451-4DF2-9D21-26C76EB85C22}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Argu.Tests", "tests\Argu.Tests\Argu.Tests.fsproj", "{8E234746-5098-4400-98F1-62C77AB91711}" 
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Argu.Tests", "tests\Argu.Tests\Argu.Tests.fsproj", "{8E234746-5098-4400-98F1-62C77AB91711}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{6CAC8891-E2B6-4CC8-AACF-0AAA4F2A49D0}" 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{6CAC8891-E2B6-4CC8-AACF-0AAA4F2A49D0}"
 	ProjectSection(SolutionItems) = preProject
 		.config\dotnet-tools.json = .config\dotnet-tools.json
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{83FE66F8-6E59-4178-8962-11117B51F39C}" 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{83FE66F8-6E59-4178-8962-11117B51F39C}"
 	ProjectSection(SolutionItems) = preProject
 		.github\ISSUE_TEMPLATE.md = .github\ISSUE_TEMPLATE.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{EE42293D-9398-4EF4-B151-9DE992EBB85A}" 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{EE42293D-9398-4EF4-B151-9DE992EBB85A}"
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\build.yml = .github\workflows\build.yml
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{306D68AD-1E01-4367-9498-EF4CEDE0AF38}" 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{306D68AD-1E01-4367-9498-EF4CEDE0AF38}"
 	ProjectSection(SolutionItems) = preProject
 		.paket\Paket.Restore.targets = .paket\Paket.Restore.targets
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2687163A-E0EA-4EC6-A388-430314AA8C85}" 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2687163A-E0EA-4EC6-A388-430314AA8C85}"
 	ProjectSection(SolutionItems) = preProject
 		.dockerignore = .dockerignore
 		.gitignore = .gitignore
 		.tfignore = .tfignore
-		.travis.yml = .travis.yml
-		appveyor.yml = appveyor.yml
-		Argu.sln = Argu.sln
 		build.cmd = build.cmd
 		build.fsx = build.fsx
 		build.sh = build.sh
@@ -48,32 +45,33 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		paket.lock = paket.lock
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md
+		.github\workflows\build.yml = .github\workflows\build.yml
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{C9E28045-41C6-422E-9928-4220EF3FF19B}" 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{C9E28045-41C6-422E-9928-4220EF3FF19B}"
 	ProjectSection(SolutionItems) = preProject
 		docs\_template.html = docs\_template.html
 		docs\index.fsx = docs\index.fsx
 		docs\perf.fsx = docs\perf.fsx
 		docs\tutorial.fsx = docs\tutorial.fsx
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{10ED3503-22F2-42EF-8B35-C979A5B700D0}" 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{10ED3503-22F2-42EF-8B35-C979A5B700D0}"
 	ProjectSection(SolutionItems) = preProject
 		docs\img\logo.pdn = docs\img\logo.pdn
 		docs\img\logo.png = docs\img\logo.png
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resource", "resource", "{B1E24C6F-9B2C-4102-B99A-9065B5745E6F}" 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resource", "resource", "{B1E24C6F-9B2C-4102-B99A-9065B5745E6F}"
 	ProjectSection(SolutionItems) = preProject
 		resource\logo.png = resource\logo.png
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A15390A5-BC39-433F-BA25-8775B4C2E329}" 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A15390A5-BC39-433F-BA25-8775B4C2E329}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{93AB3CBB-7714-49DD-9C6F-40E153A66E8F}" 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{93AB3CBB-7714-49DD-9C6F-40E153A66E8F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E40F0B06-703E-4541-826F-3B8AED67AF7B}" 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E40F0B06-703E-4541-826F-3B8AED67AF7B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <IsPackable>false</IsPackable>
+    <WarningLevel>5</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
@@ -10,15 +10,7 @@
     <Authors>Eirik Tsarpalis</Authors>
     <Copyright>2019</Copyright>
     <PackageTags>F#, argument, parser</PackageTags>
-    <RepositoryUrl>https://github.com/fsprojects/Argu/</RepositoryUrl>
     <PackageProjectUrl>https://fsprojects.github.io/Argu/</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <!-- SourceLink Options -->
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <!--<IncludeSymbols>true</IncludeSymbols>-->
-    <!--<SymbolPackageFormat>snupkg</SymbolPackageFormat>-->
   </PropertyGroup>
 </Project>
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim-amd64
+FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim-amd64
 
 # allow pushing docs & tags using docker builds:
 # pass git credentials using $GITHUB_TOKEN environment variable

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.100",
+    "version": "6.0.200",
     "rollForward": "minor"
   }
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -4,7 +4,7 @@ storage: none
 
 nuget FSharp.Core >= 4.3.2 lowest_matching:true
 nuget System.Configuration.ConfigurationManager >= 4.0 lowest_matching:true
-nuget Microsoft.SourceLink.GitHub prerelease copy_local:true
+nuget DotNet.ReproducibleBuilds
 
 group Tests
   source https://api.nuget.org/v3/index.json
@@ -30,4 +30,4 @@ group Build
   nuget Fake.IO.FileSystem      ~> 5.20.0
   nuget Fake.DotNet.Cli	        ~> 5.20.0
   nuget Fake.Tools.Git          ~> 5.20.0
-  nuget Fake.Api.Github         ~> 5.20.0
+  nuget Fake.Api.Github         ~> 5.20.0
diff --git a/paket.lock b/paket.lock
@@ -2,12 +2,26 @@ STORAGE: NONE
 RESTRICTION: == netstandard2.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
+    DotNet.ReproducibleBuilds (1.1.1)
+      Microsoft.SourceLink.AzureRepos.Git (>= 1.1.1)
+      Microsoft.SourceLink.Bitbucket.Git (>= 1.1.1)
+      Microsoft.SourceLink.GitHub (>= 1.1.1)
+      Microsoft.SourceLink.GitLab (>= 1.1.1)
     FSharp.Core (4.3.2)
-    Microsoft.Build.Tasks.Git (1.1.0-beta-20204-02) - copy_local: true
-    Microsoft.SourceLink.Common (1.1.0-beta-20204-02) - copy_local: true
-    Microsoft.SourceLink.GitHub (1.1.0-beta-20204-02) - copy_local: true
-      Microsoft.Build.Tasks.Git (>= 1.1.0-beta-20204-02)
-      Microsoft.SourceLink.Common (>= 1.1.0-beta-20204-02)
+    Microsoft.Build.Tasks.Git (1.1.1)
+    Microsoft.SourceLink.AzureRepos.Git (1.1.1)
+      Microsoft.Build.Tasks.Git (>= 1.1.1)
+      Microsoft.SourceLink.Common (>= 1.1.1)
+    Microsoft.SourceLink.Bitbucket.Git (1.1.1)
+      Microsoft.Build.Tasks.Git (>= 1.1.1)
+      Microsoft.SourceLink.Common (>= 1.1.1)
+    Microsoft.SourceLink.Common (1.1.1)
+    Microsoft.SourceLink.GitHub (1.1.1)
+      Microsoft.Build.Tasks.Git (>= 1.1.1)
+      Microsoft.SourceLink.Common (>= 1.1.1)
+    Microsoft.SourceLink.GitLab (1.1.1)
+      Microsoft.Build.Tasks.Git (>= 1.1.1)
+      Microsoft.SourceLink.Common (>= 1.1.1)
     System.Buffers (4.5.1)
     System.Configuration.ConfigurationManager (4.4)
       System.Security.Cryptography.ProtectedData (>= 4.4)

diff --git a/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj b/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AssemblyName>ls</AssemblyName>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Arguments.fs" />

diff --git a/src/Argu/Argu.fsproj b/src/Argu/Argu.fsproj
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <IsPackable>true</IsPackable>
     <PackageIcon>logo.png</PackageIcon>
   </PropertyGroup>
   <ItemGroup>
@@ -24,4 +22,4 @@
     <None Include="..\..\resource\logo.png" Pack="true" PackagePath="" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>
diff --git a/src/Argu/Parsers/Cli.fs b/src/Argu/Parsers/Cli.fs
@@ -1,6 +1,7 @@
 [<AutoOpen>]
 module internal Argu.CliParser
 
+[<NoComparison; NoEquality>]
 type CliParseToken =
     | EndOfStream
     | CliParam of token:string * switch:string * caseInfo:UnionCaseArgInfo * assignment:Assignment
@@ -147,7 +148,7 @@ and CliParseResultAggregatorStack (context : UnionArgInfo) =
         stack.Add agg
         agg
 
-
+[<NoComparison; NoEquality>]
 type CliParseState =
     {
         ProgramName : string

diff --git a/src/Argu/Parsers/Common.fs b/src/Argu/Parsers/Common.fs
@@ -3,7 +3,9 @@ module internal Argu.CommonParsers
 
 type KeyValueParseResult = Choice<UnionCaseParseResult [], exn>
 
+[<NoComparison; NoEquality>]
 exception ParseError of message:string * code:ErrorCode * argInfo:UnionArgInfo
+[<NoComparison; NoEquality>]
 exception HelpText of subcommand:UnionArgInfo
 
 let inline error argInfo code fmt =
@@ -93,4 +95,4 @@ let postProcessResults (argInfo : UnionArgInfo) (ignoreMissingMandatory : bool)
         UnrecognizedCliParams = match commandLineResults with Some clr -> clr.UnrecognizedCliParams | None -> []
         UnrecognizedCliParseResults = match commandLineResults with Some clr -> clr.UnrecognizedCliParseResults | None -> []
         IsUsageRequested = commandLineResults |> Option.exists (fun r -> r.IsUsageRequested)
-    }
+    }
diff --git a/src/Argu/Parsers/KeyValue.fs b/src/Argu/Parsers/KeyValue.fs
@@ -17,6 +17,7 @@ type KeyValueParseResults (argInfo : UnionArgInfo) =
 
     member __.Results : KeyValueParseResult [] = results
 
+[<NoComparison; NoEquality>]
 type KeyValueParseState =
     {
         ArgInfo : UnionArgInfo
@@ -106,4 +107,4 @@ let private parseKeyValuePartial (state : KeyValueParseState) (caseInfo : UnionC
 let parseKeyValueConfig (configReader : IConfigurationReader) (argInfo : UnionArgInfo) =
     let state = { ArgInfo = argInfo ; Reader = configReader ; Results = new KeyValueParseResults(argInfo) }
     for caseInfo in argInfo.Cases.Value do parseKeyValuePartial state caseInfo
-    state.Results.Results
+    state.Results.Results
diff --git a/src/Argu/UnionArgInfo.fs b/src/Argu/UnionArgInfo.fs
@@ -122,7 +122,7 @@ with
     member inline __.IsCommandLineArg = match __.CommandLineNames.Value with [] -> __.IsMainCommand | _ -> true
     member inline __.IsCustomAssignment = Option.isSome __.CustomAssignmentSeparator.Value
 
-and ParameterInfo =
+and [<NoComparison; NoEquality>] ParameterInfo =
     | Primitives of FieldParserInfo []
     | OptionalParam of Existential * FieldParserInfo
     | ListParam of Existential * FieldParserInfo
@@ -231,4 +231,4 @@ type UnionCaseArgInfo with
             IsHidden = ucai.IsHidden
             IsGatherUnrecognized = ucai.IsGatherUnrecognized
             GatherAllSources = ucai.GatherAllSources
-        }
+        }
diff --git a/src/Argu/paket.references b/src/Argu/paket.references
@@ -1,3 +1,3 @@
 FSharp.Core
 System.Configuration.ConfigurationManager
-Microsoft.SourceLink.GitHub
+DotNet.ReproducibleBuilds
diff --git a/tests/Argu.Tests/Argu.Tests.fsproj b/tests/Argu.Tests/Argu.Tests.fsproj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>