pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Ditch nuspec.template

pull/2642/head
Siegfried Pammer 3 years ago
parent
44dee6ecc2
commit
406f537fbe
5 changed files with 23 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 4
      BuildTools/update-assemblyinfo.ps1
  3. 22
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  4. 30
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
  5. 2
      ILSpy.sln

1
.gitignore vendored
Unescape View File

@ -21,3 +21,4 @@ _ReSharper*/ @@ -21,3 +21,4 @@ _ReSharper*/
multitargeting.props
ILSpy.Installer/wix/
ILSpy.Installer/AppPackage.cs
/VERSION

4
BuildTools/update-assemblyinfo.ps1
Unescape View File

@ -81,7 +81,6 @@ function gitBranch() { @@ -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 { @@ -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;

22
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
Unescape View File

@ -4,10 +4,22 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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">

30
ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
Unescape View File

@ -1,30 +0,0 @@ @@ -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>

2
ILSpy.sln
Unescape View File

@ -51,6 +51,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ILSpy.AddIn.Shared", "ILSpy @@ -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

Write Preview
Loading…
Cancel
Save