added NuGetizer to fix package issues, updated dependencies, updated …

…nuke build to 6.0.3 (#630)
picklesdoc · May 4, 2022 · edaef7d · edaef7d
1 parent 22a4d45
commit edaef7d
Show file tree

Hide file tree

Showing 55 changed files with 6,336 additions and 6,208 deletions.
diff --git a/Build.md b/Build.md
@@ -0,0 +1,8 @@
+
+
+set version number in _build\Build.cs
+
+PowerShell
+
+set-executionpolicy -scope process -executionpolicy bypass
+.\build.ps1
diff --git a/Pickles.sln b/Pickles.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31019.35
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32421.90
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Runners", "Runners", "{4E977674-6919-4F15-A6E3-37BFAC18C7E5}"
 EndProject
@@ -44,32 +44,38 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pickles.DocumentationBuilde
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pickles.DocumentationBuilders.Markdown", "src\Pickles.DocumentationBuilders.Markdown\Pickles.DocumentationBuilders.Markdown.csproj", "{732039F2-CAD8-44BC-9647-EC0ACAF59632}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.CommandLine", "src\Pickles.CommandLine\Pickles.CommandLine.csproj", "{453AA469-4548-4195-8E8E-940B3D29C84A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pickles.CommandLine", "src\Pickles.CommandLine\Pickles.CommandLine.csproj", "{453AA469-4548-4195-8E8E-940B3D29C84A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.ObjectModel", "src\Pickles.ObjectModel\Pickles.ObjectModel.csproj", "{AA5E87FC-1116-44F4-8C25-8CFDECB88417}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pickles.ObjectModel", "src\Pickles.ObjectModel\Pickles.ObjectModel.csproj", "{AA5E87FC-1116-44F4-8C25-8CFDECB88417}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.Test", "src\Pickles.Test\Pickles.Test.csproj", "{FAA00162-E809-4629-B61B-B3B8B0DF1678}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pickles.Test", "src\Pickles.Test\Pickles.Test.csproj", "{FAA00162-E809-4629-B61B-B3B8B0DF1678}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "markdowndeep", "src\markdowndeep\markdowndeep.csproj", "{22AE877D-C944-4451-A754-B03173250052}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "markdowndeep", "src\markdowndeep\markdowndeep.csproj", "{22AE877D-C944-4451-A754-B03173250052}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.CommandLine.UnitTests", "src\Pickles.CommandLine.UnitTests\Pickles.CommandLine.UnitTests.csproj", "{4DFDDA7F-6CC6-4CF8-B3C2-C97B9746EC01}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pickles.CommandLine.UnitTests", "src\Pickles.CommandLine.UnitTests\Pickles.CommandLine.UnitTests.csproj", "{4DFDDA7F-6CC6-4CF8-B3C2-C97B9746EC01}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.MSBuild", "src\Pickles.MSBuild\Pickles.MSBuild.csproj", "{BF34D482-3E0A-4384-AB61-FCF6BCE2E306}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pickles.MSBuild", "src\Pickles.MSBuild\Pickles.MSBuild.csproj", "{BF34D482-3E0A-4384-AB61-FCF6BCE2E306}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.PowerShell", "src\Pickles.PowerShell\Pickles.PowerShell.csproj", "{FA2D2086-9811-459D-86A9-779DBF1984BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pickles.PowerShell", "src\Pickles.PowerShell\Pickles.PowerShell.csproj", "{FA2D2086-9811-459D-86A9-779DBF1984BB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles", "src\Pickles\Pickles.csproj", "{9AD58876-1368-493B-9D8A-08782AAAA0AA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pickles", "src\Pickles\Pickles.csproj", "{9AD58876-1368-493B-9D8A-08782AAAA0AA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_build", "build\_build.csproj", "{0C2B878C-B6A6-4548-9CC8-DCFA64A64908}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{0C2B878C-B6A6-4548-9CC8-DCFA64A64908}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Release", "Release", "{436E3469-289B-4EC3-9E2F-0C72885D1014}"
-ProjectSection(SolutionItems) = preProject
-	README.md = README.md
-	CHANGELOG.md = CHANGELOG.md
-	LICENSE.txt = LICENSE.txt
-	CONTRIBUTING.md = CONTRIBUTING.md
-	pickles.png = pickles.png
-EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		Build.md = Build.md
+		CHANGELOG.md = CHANGELOG.md
+		CONTRIBUTING.md = CONTRIBUTING.md
+		LICENSE.txt = LICENSE.txt
+		pickles.png = pickles.png
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFiles", "SolutionFiles", "{9AE94E28-A5DF-4C0F-B7E4-A3AFA3ED608A}"
+	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/build.ps1 b/build.ps1
@@ -63,7 +63,7 @@ else {
     $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
 }
 
-Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)"
+Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)"
 
 ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet }
 ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments }
diff --git a/build.sh b/build.sh
@@ -56,7 +56,7 @@ else
     export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
 fi
 
-echo "Microsoft (R) .NET Core SDK version $("$DOTNET_EXE" --version)"
+echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)"
 
 "$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet
 "$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@"
diff --git a/build/Build.cs b/build/Build.cs
@@ -56,7 +56,7 @@ public static int Main()
 
     String AssemblyProduct = "Pickles";
     String AssemblyCompany = "Pickles";
-    String Version = "3.0.1";
+    String Version = "3.1.0";
     String Copyright = "Copyright (c) Jeffrey Cameron 2010-2012, PicklesDoc 2012-present";
     String NuGetApiKey = "";
 

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
-    <PackageReference Include="Nuke.Common" Version="5.3.0" />
+    <PackageReference Include="Nuke.Common" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "6.0.202"
+  }
+}
diff --git a/src/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.csproj b/src/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.csproj
@@ -39,8 +39,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NFluent" Version="2.7.2" />
+    <PackageReference Include="NuGetizer" Version="0.7.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="13.2.47" />
+    <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="17.0.3" />
   </ItemGroup>
 </Project>