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

Rename installer project to ILSpy.Installer, use ILSpy app version as MSI package version

pull/2558/head
Andreas Weizel 4 years ago
parent
99814773d0
commit
05874991a9
9 changed files with 42 additions and 9 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. 5
      .gitignore
  2. 3
      BuildTools/update-assemblyinfo.ps1
  3. 0
      ILSpy.Installer/App.config
  4. 9
      ILSpy.Installer/AppPackage.cs.template
  5. 9
      ILSpy.Installer/ILSpy.Installer.csproj
  6. 0
      ILSpy.Installer/Properties/AssemblyInfo.cs
  7. 0
      ILSpy.Installer/packages.config
  8. 14
      ILSpy.Installer/setup.cs
  9. 11
      ILSpy.sln

5
.gitignore vendored
Unescape View File

@ -20,5 +20,6 @@ _ReSharper*/ @@ -20,5 +20,6 @@ _ReSharper*/
/ICSharpCode.Decompiler.Tests/TestCases/Correctness/*.exe.config
/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec
multitargeting.props
ILSpy.MsiBuilder/wix/*.g.wxs
ILSpy.MsiBuilder/output/
ILSpy.Installer/wix/*.g.wxs
ILSpy.Installer/output/
ILSpy.Installer/AppPackage.cs

3
BuildTools/update-assemblyinfo.ps1
Unescape View File

@ -76,7 +76,8 @@ $templateFiles = ( @@ -76,7 +76,8 @@ $templateFiles = (
@{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"}
@{Input="ILSpy.AddIn.VS2022/source.extension.vsixmanifest.template"; Output = "ILSpy.AddIn.VS2022/source.extension.vsixmanifest"},
@{Input="ILSpy.Installer/AppPackage.cs.template"; Output = "ILSpy.Installer/AppPackage.cs"}
);
$appxmanifestFiles = (

0
ILSpy.MsiBuilder/App.config → ILSpy.Installer/App.config
Unescape View File

9
ILSpy.Installer/AppPackage.cs.template
Unescape View File

@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
using System;
namespace ILSpy.Installer
{
internal static class AppPackage
{
public static Version Version = new Version("$INSERTVERSION$");
}
}

9
ILSpy.MsiBuilder/ILSpy.MsiBuilder.csproj → ILSpy.Installer/ILSpy.Installer.csproj
Unescape View File

@ -6,8 +6,8 @@ @@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{A4BA0771-DA4A-4A94-A5EC-5BA10B52816F}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>ILSpy.MsiBuilder</RootNamespace>
<AssemblyName>ILSpy.MsiBuilder</AssemblyName>
<RootNamespace>ILSpy.Installer</RootNamespace>
<AssemblyName>ILSpy.Installer</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@ -35,6 +35,9 @@ @@ -35,6 +35,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<StartupObject>ILSpy.Installer.Builder</StartupObject>
</PropertyGroup>
<ItemGroup>
<Reference Include="BootstrapperCore, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.19.0\lib\BootstrapperCore.dll</HintPath>
@ -61,6 +64,8 @@ @@ -61,6 +64,8 @@
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="AppPackage.cs.template" />
<Compile Include="AppPackage.cs" />
<Compile Include="setup.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<None Include="wix\$(ProjectName).g.wxs" />

0
ILSpy.MsiBuilder/Properties/AssemblyInfo.cs → ILSpy.Installer/Properties/AssemblyInfo.cs
Unescape View File

0
ILSpy.MsiBuilder/packages.config → ILSpy.Installer/packages.config
Unescape View File

14
ILSpy.MsiBuilder/setup.cs → ILSpy.Installer/setup.cs
Unescape View File

@ -3,9 +3,9 @@ using System.IO; @@ -3,9 +3,9 @@ using System.IO;
using WixSharp;
namespace ILSpy.MsiBuilder
namespace ILSpy.Installer
{
internal class MsiBuilder
internal class Builder
{
static public void Main()
{
@ -20,12 +20,18 @@ namespace ILSpy.MsiBuilder @@ -20,12 +20,18 @@ namespace ILSpy.MsiBuilder
new Files(@"ILSpy\bin\Release\net472\ILSpy.ReadyToRun.Plugin.resources.dll")));
project.GUID = new Guid("a12fdab1-731b-4a98-9749-d481ce8692ab");
project.Version = new Version("1.0.0.0");
project.Version = AppPackage.Version;
project.SourceBaseDir = Path.GetDirectoryName(Environment.CurrentDirectory);
project.InstallScope = InstallScope.perUser;
project.InstallPrivileges = InstallPrivileges.limited;
project.UI = WUI.WixUI_Minimal;
project.MajorUpgrade = new MajorUpgrade {
Schedule = UpgradeSchedule.afterInstallInitialize,
AllowSameVersionUpgrades = true,
DowngradeErrorMessage = "A newer release of ILSpy is already installed on this system. Please uninstall it first to continue."
};
project.UI = WUI.WixUI_ProgressOnly;
Compiler.BuildMsi(project, Path.Combine(Environment.CurrentDirectory, "output", "ILSpy.msi"));
}

11
ILSpy.sln
Unescape View File

@ -47,6 +47,13 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ILSpy.AddIn.Shared", "ILSpy @@ -47,6 +47,13 @@ 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}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.Installer", "ILSpy.Installer\ILSpy.Installer.csproj", "{A4BA0771-DA4A-4A94-A5EC-5BA10B52816F}"
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
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
ILSpy.AddIn.Shared\ILSpy.AddIn.Shared.projitems*{09a03980-d14a-4705-a38c-741ad7166dee}*SharedItemsImports = 5
@ -114,6 +121,10 @@ Global @@ -114,6 +121,10 @@ Global
{09A03980-D14A-4705-A38C-741AD7166DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{09A03980-D14A-4705-A38C-741AD7166DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{09A03980-D14A-4705-A38C-741AD7166DEE}.Release|Any CPU.Build.0 = Release|Any CPU
{A4BA0771-DA4A-4A94-A5EC-5BA10B52816F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4BA0771-DA4A-4A94-A5EC-5BA10B52816F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4BA0771-DA4A-4A94-A5EC-5BA10B52816F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4BA0771-DA4A-4A94-A5EC-5BA10B52816F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

Write Preview
Loading…
Cancel
Save