From 406f537fbeceecbfb0987678fa03ee6f3bdd7c22 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Sat, 5 Mar 2022 12:55:43 +0100
Subject: [PATCH] Ditch nuspec.template

---
 .gitignore                                    |  1 +
 BuildTools/update-assemblyinfo.ps1            |  4 ++-
 .../ICSharpCode.Decompiler.csproj             | 22 ++++++++++----
 .../ICSharpCode.Decompiler.nuspec.template    | 30 -------------------
 ILSpy.sln                                     |  2 ++
 5 files changed, 23 insertions(+), 36 deletions(-)
 delete mode 100644 ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template

diff --git a/.gitignore b/.gitignore
index 33ed251af..9f12096c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ _ReSharper*/
 multitargeting.props
 ILSpy.Installer/wix/
 ILSpy.Installer/AppPackage.cs
+/VERSION
diff --git a/BuildTools/update-assemblyinfo.ps1 b/BuildTools/update-assemblyinfo.ps1
index c0977f3d9..d9a3d9423 100644
--- a/BuildTools/update-assemblyinfo.ps1
+++ b/BuildTools/update-assemblyinfo.ps1
@@ -81,7 +81,6 @@ function gitBranch() {
 $templateFiles = (
 	@{Input=$globalAssemblyInfoTemplateFile; Output="ILSpy/Properties/AssemblyInfo.cs"},
 	@{Input="ICSharpCode.Decompiler/Properties/AssemblyInfo.template.cs"; Output="ICSharpCode.Decompiler/Properties/AssemblyInfo.cs"},
-	@{Input="ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template"; Output="ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec"},
     @{Input="ILSpy/Properties/app.config.template"; Output = "ILSpy/app.config"},
     @{Input="ILSpy.AddIn/source.extension.vsixmanifest.template"; Output = "ILSpy.AddIn/source.extension.vsixmanifest"},
     @{Input="ILSpy.AddIn.VS2022/source.extension.vsixmanifest.template"; Output = "ILSpy.AddIn.VS2022/source.extension.vsixmanifest"},
@@ -138,6 +137,9 @@ try {
 	}
 
     $fullVersionNumber = "$major.$minor.$build.$revision";
+    if ((-not (Test-File "VERSION")) -or (((Get-Content "VERSION") -Join [System.Environment]::NewLine) -ne "$fullVersionNumber$postfixVersionName")) {
+        "$fullVersionNumber$postfixVersionName" | Out-File -Encoding utf8 -NoNewLine "VERSION";
+    }
     
     foreach ($file in $templateFiles) {
         [string]$in = (Get-Content $file.Input) -Join [System.Environment]::NewLine;
diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
index 8690ed2d5..78a107ea1 100644
--- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
+++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
@@ -4,10 +4,22 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
 
-    <Description>IL decompiler engine</Description>
+    <PackageId>ICSharpCode.Decompiler</PackageId>
+    <PackageVersion>8.0.0.0-alpha1</PackageVersion>
+    <Title>ILSpy Decompiler Engine</Title>
+    <Authors>ILSpy Contributors</Authors>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/icsharpcode/ILSpy/</PackageProjectUrl>
+    <Description>ICSharpCode.Decompiler is the decompiler engine used in ILSpy.</Description>
     <Company>ic#code</Company>
     <Product>ILSpy</Product>
-    <Copyright>Copyright 2011-2022 AlphaSierraPapa for the SharpDevelop Team</Copyright>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/icsharpcode/ILSpy.git</RepositoryUrl>
+    <PackageIconUrl>images\DecompilerNuGetPackageIcon.png</PackageIconUrl>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <Copyright>Copyright 2011-$([System.DateTime]::Now.Year) AlphaSierraPapa</Copyright>
+    <PackageTags>C# Decompiler ILSpy</PackageTags>
+    
     <NeutralLanguage>en-US</NeutralLanguage>
     <GenerateAssemblyVersionAttribute>False</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>False</GenerateAssemblyFileVersionAttribute>
@@ -29,7 +41,6 @@
   <!-- HACK: Disable package generation on Unix due to tooling issues. -->
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <NuspecFile>ICSharpCode.Decompiler.nuspec</NuspecFile>
     <NuspecProperties>Configuration=$(Configuration)</NuspecProperties>
   </PropertyGroup>
 
@@ -629,8 +640,6 @@
     <Compile Include="Util\TreeTraversal.cs" />
     <Compile Include="Util\UnionFind.cs" />
     <Compile Include="Util\Win32Resources.cs" />
-    <None Include="ICSharpCode.Decompiler.nuspec" DependentUpon="ICSharpCode.Decompiler.nuspec.template" />
-    <None Include="ICSharpCode.Decompiler.nuspec.template" />
     <None Include="ICSharpCode.Decompiler.ruleset" />
     <None Include="ICSharpCode.Decompiler.snk" />
     <None Include="Metadata\ILOpCodes.tt">
@@ -676,6 +685,9 @@
     </Exec>
     <Exec WorkingDirectory=".." Command="$(UpdateAssemblyInfo)" Timeout="60000" Condition="'$(CommitHash)'!='$(LastCommitHash)'" />
     <WriteLinesToFile Lines="$(CommitHash)" File="@(UpdateAssemblyInfoStamp)" Overwrite="true" Condition="'$(CommitHash)'!='$(LastCommitHash)'" />
+    <ReadLinesFromFile ContinueOnError="true" File="..\VERSION">
+      <Output TaskParameter="Lines" PropertyName="PackageVersion" />
+    </ReadLinesFromFile>
   </Target>
 
   <Target Name="CleanUpdateAssemblyInfo" BeforeTargets="BeforeClean">
diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
deleted file mode 100644
index d371363fb..000000000
--- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-	<metadata>
-		<id>ICSharpCode.Decompiler</id>
-		<version>$INSERTVERSION$$INSERTVERSIONNAMEPOSTFIX$$INSERTBUILDCONFIG$</version>
-		<title>ILSpy Decompiler Engine</title>
-		<authors>ILSpy Contributors</authors>
-		<owners>Daniel Grunwald, SharpDevelop</owners>
-		<license type="expression">MIT</license>
-		<projectUrl>https://github.com/icsharpcode/ILSpy/</projectUrl>
-		<repository type="git" url="https://github.com/icsharpcode/ILSpy.git" />
-		<icon>images\DecompilerNuGetPackageIcon.png</icon>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>ICSharpCode.Decompiler is the decompiler engine used in ILSpy.</description>
-		<!--<releaseNotes></releaseNotes>-->
-		<copyright>Copyright 2011-$INSERTYEAR$ AlphaSierraPapa</copyright>
-		<tags>C# Decompiler ILSpy</tags>
-		<dependencies>
-			<group targetFramework=".NETStandard2.0">
-				<dependency id="System.Collections.Immutable" version="5.0.0" />
-				<dependency id="System.Reflection.Metadata" version="5.0.0" />
-			</group>
-		</dependencies>
-	</metadata>
-	<files>
-		<file src="DecompilerNuGetPackageIcon.png" target="images\" />
-		<file src="bin\$Configuration$\netstandard2.0\ICSharpCode.Decompiler.dll" target="lib\netstandard2.0" />
-		<file src="bin\$Configuration$\netstandard2.0\ICSharpCode.Decompiler.xml" target="lib\netstandard2.0" />
-	</files>
-</package>
diff --git a/ILSpy.sln b/ILSpy.sln
index 24ffba062..bbb51a9b5 100644
--- a/ILSpy.sln
+++ b/ILSpy.sln
@@ -51,6 +51,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ILSpy.AddIn.Shared", "ILSpy
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy.AddIn.VS2022", "ILSpy.AddIn.VS2022\ILSpy.AddIn.VS2022.csproj", "{09A03980-D14A-4705-A38C-741AD7166DEE}"
 	ProjectSection(ProjectDependencies) = postProject
+		{0313F581-C63B-43BB-AA9B-07615DABD8A3} = {0313F581-C63B-43BB-AA9B-07615DABD8A3}
+		{A6BAD2BA-76BA-461C-8B6D-418607591247} = {A6BAD2BA-76BA-461C-8B6D-418607591247}
 		{1E85EFF9-E370-4683-83E4-8A3D063FF791} = {1E85EFF9-E370-4683-83E4-8A3D063FF791}
 	EndProjectSection
 EndProject