Skip to content

Commit

Permalink
* Include missing .json config in ILSpy.Installer.
Browse files Browse the repository at this point in the history 
* Add build action to check file lists of msi and vsix packages.
  • Loading branch information
@siegfriedpammer
siegfriedpammer committed Apr 15, 2022
1 parent 4b8e6a4 commit 78c7ece
Show file tree
Hide file tree
Showing 6 changed files with 203 additions and 1 deletion.
9 changes: 8 additions & 1 deletion .github/workflows/build-ilspy.yml
View file
Expand Up @@ -70,8 +70,15 @@ jobs:
list-suites: 'all'
list-tests: 'failed'

- name: Style - tab check
- name: Format check
run: python BuildTools\tidy.py

- name: Verify package contents
if: matrix.configuration == 'debug'
shell: pwsh
run: |
.\BuildTools\create-filelists.ps1
git diff --exit-code
- name: Zip ILSpy (framework-dependent)
run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries.zip .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.dll .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.exe .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.config .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.json .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*\ILSpy.resources.dll .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*\ILSpy.ReadyToRun.Plugin.resources.dll
Expand Down
64 changes: 64 additions & 0 deletions BuildTools/ILSpy.AddIn.VS2022.vsix.filelist
View file
@@ -0,0 +1,64 @@
[Content_Types].xml
catalog.json
en-US\ILSpy.AddIn.VS2022.resources.dll
extension.vsixmanifest
ICSharpCode.Decompiler.dll
ICSharpCode.ILSpyX.dll
ICSharpCode.TreeView.dll
ILSpy.AddIn.VS2022.dll
ILSpy.AddIn.VS2022.pkgdef
ILSpy.BamlDecompiler.Plugin.dll
ILSpy.deps.json
ILSpy.dll
ILSpy.exe
ILSpy.ReadyToRun.Plugin.dll
ILSpy.runtimeconfig.json
ILSpy\AvalonDock.dll
ILSpy\AvalonDock.Themes.VS2013.dll
ILSpy\DataGridExtensions.dll
ILSpy\Iced.dll
ILSpy\ICSharpCode.AvalonEdit.dll
ILSpy\ICSharpCode.Decompiler.dll
ILSpy\ICSharpCode.ILSpyX.dll
ILSpy\ICSharpCode.TreeView.dll
ILSpy\ILCompiler.Reflection.ReadyToRun.dll
ILSpy\ILSpy.BamlDecompiler.Plugin.deps.json
ILSpy\ILSpy.BamlDecompiler.Plugin.dll
ILSpy\ILSpy.deps.json
ILSpy\ILSpy.dll
ILSpy\ILSpy.exe
ILSpy\ILSpy.ReadyToRun.Plugin.deps.json
ILSpy\ILSpy.ReadyToRun.Plugin.dll
ILSpy\ILSpy.runtimeconfig.json
ILSpy\K4os.Compression.LZ4.dll
ILSpy\Microsoft.DiaSymReader.Converter.Xml.dll
ILSpy\Microsoft.DiaSymReader.dll
ILSpy\Microsoft.DiaSymReader.PortablePdb.dll
ILSpy\Microsoft.VisualStudio.Composition.dll
ILSpy\Microsoft.VisualStudio.Composition.NetFxAttributes.dll
ILSpy\Microsoft.VisualStudio.Validation.dll
ILSpy\Microsoft.Xaml.Behaviors.dll
ILSpy\Mono.Cecil.dll
ILSpy\Mono.Cecil.Mdb.dll
ILSpy\Mono.Cecil.Pdb.dll
ILSpy\Mono.Cecil.Rocks.dll
ILSpy\System.ComponentModel.Composition.dll
ILSpy\System.Composition.AttributedModel.dll
ILSpy\System.Composition.Convention.dll
ILSpy\System.Composition.Hosting.dll
ILSpy\System.Composition.Runtime.dll
ILSpy\System.Composition.TypedParts.dll
ILSpy\TomsToolbox.Essentials.dll
ILSpy\TomsToolbox.ObservableCollections.dll
ILSpy\TomsToolbox.Wpf.dll
ILSpy\TomsToolbox.Wpf.Styles.dll
ILSpy\zh-Hans\ILSpy.ReadyToRun.Plugin.resources.dll
ILSpy\zh-Hans\ILSpy.resources.dll
ILSpy-Large.ico
license.txt
manifest.json
Mono.Cecil.dll
zh-Hans\extension.vsixlangpack
zh-Hans\ILSpy.AddIn.VS2022.resources.dll
zh-Hans\ILSpy.ReadyToRun.Plugin.resources.dll
zh-Hans\ILSpy.resources.dll
64 changes: 64 additions & 0 deletions BuildTools/ILSpy.AddIn.vsix.filelist
View file
@@ -0,0 +1,64 @@
[Content_Types].xml
catalog.json
en-US\ILSpy.AddIn.resources.dll
extension.vsixmanifest
ICSharpCode.Decompiler.dll
ICSharpCode.ILSpyX.dll
ICSharpCode.TreeView.dll
ILSpy.AddIn.dll
ILSpy.AddIn.pkgdef
ILSpy.BamlDecompiler.Plugin.dll
ILSpy.deps.json
ILSpy.dll
ILSpy.exe
ILSpy.ReadyToRun.Plugin.dll
ILSpy.runtimeconfig.json
ILSpy\AvalonDock.dll
ILSpy\AvalonDock.Themes.VS2013.dll
ILSpy\DataGridExtensions.dll
ILSpy\Iced.dll
ILSpy\ICSharpCode.AvalonEdit.dll
ILSpy\ICSharpCode.Decompiler.dll
ILSpy\ICSharpCode.ILSpyX.dll
ILSpy\ICSharpCode.TreeView.dll
ILSpy\ILCompiler.Reflection.ReadyToRun.dll
ILSpy\ILSpy.BamlDecompiler.Plugin.deps.json
ILSpy\ILSpy.BamlDecompiler.Plugin.dll
ILSpy\ILSpy.deps.json
ILSpy\ILSpy.dll
ILSpy\ILSpy.exe
ILSpy\ILSpy.ReadyToRun.Plugin.deps.json
ILSpy\ILSpy.ReadyToRun.Plugin.dll
ILSpy\ILSpy.runtimeconfig.json
ILSpy\K4os.Compression.LZ4.dll
ILSpy\Microsoft.DiaSymReader.Converter.Xml.dll
ILSpy\Microsoft.DiaSymReader.dll
ILSpy\Microsoft.DiaSymReader.PortablePdb.dll
ILSpy\Microsoft.VisualStudio.Composition.dll
ILSpy\Microsoft.VisualStudio.Composition.NetFxAttributes.dll
ILSpy\Microsoft.VisualStudio.Validation.dll
ILSpy\Microsoft.Xaml.Behaviors.dll
ILSpy\Mono.Cecil.dll
ILSpy\Mono.Cecil.Mdb.dll
ILSpy\Mono.Cecil.Pdb.dll
ILSpy\Mono.Cecil.Rocks.dll
ILSpy\System.ComponentModel.Composition.dll
ILSpy\System.Composition.AttributedModel.dll
ILSpy\System.Composition.Convention.dll
ILSpy\System.Composition.Hosting.dll
ILSpy\System.Composition.Runtime.dll
ILSpy\System.Composition.TypedParts.dll
ILSpy\TomsToolbox.Essentials.dll
ILSpy\TomsToolbox.ObservableCollections.dll
ILSpy\TomsToolbox.Wpf.dll
ILSpy\TomsToolbox.Wpf.Styles.dll
ILSpy\zh-Hans\ILSpy.ReadyToRun.Plugin.resources.dll
ILSpy\zh-Hans\ILSpy.resources.dll
ILSpy-Large.ico
license.txt
manifest.json
Mono.Cecil.dll
zh-Hans\extension.vsixlangpack
zh-Hans\ILSpy.AddIn.resources.dll
zh-Hans\ILSpy.ReadyToRun.Plugin.resources.dll
zh-Hans\ILSpy.resources.dll
41 changes: 41 additions & 0 deletions BuildTools/ILSpy.msi.filelist
View file
@@ -0,0 +1,41 @@
AvalonDock.dll_2384574099
AvalonDock.Themes.VS2013.dll_1693991188
DataGridExtensions.dll_3175011569
Iced.dll_3795180016
ICSharpCode.AvalonEdit.dll_2202357673
ICSharpCode.Decompiler.dll_1302002478
ICSharpCode.ILSpyX.dll_1982182100
ICSharpCode.TreeView.dll_128291808
ILCompiler.Reflection.ReadyToRun.dll_961256598
ILSpy.BamlDecompiler.Plugin.deps.json_425274809
ILSpy.BamlDecompiler.Plugin.dll_1186184332
ILSpy.deps.json_14220630
ILSpy.dll_828718029
ILSpy.exe_2512527281
ILSpy.ReadyToRun.Plugin.deps.json_3602879258
ILSpy.ReadyToRun.Plugin.dll_3493023742
ILSpy.ReadyToRun.Plugin.resources.dll_3072497650
ILSpy.resources.dll_1963394151
ILSpy.runtimeconfig.json_4170109836
K4os.Compression.LZ4.dll_841780051
Microsoft.DiaSymReader.Converter.Xml.dll_1504543009
Microsoft.DiaSymReader.dll_2664270437
Microsoft.DiaSymReader.PortablePdb.dll_645824024
Microsoft.VisualStudio.Composition.dll_3669554833
Microsoft.VisualStudio.Composition.NetFxAttributes.dll_4085550965
Microsoft.VisualStudio.Validation.dll_3370943218
Microsoft.Xaml.Behaviors.dll_3088279542
Mono.Cecil.dll_2043069113
Mono.Cecil.Mdb.dll_881308441
Mono.Cecil.Pdb.dll_94684032
Mono.Cecil.Rocks.dll_284129705
System.ComponentModel.Composition.dll_3956562358
System.Composition.AttributedModel.dll_2731655713
System.Composition.Convention.dll_1880631244
System.Composition.Hosting.dll_1479266732
System.Composition.Runtime.dll_4043919224
System.Composition.TypedParts.dll_1680333710
TomsToolbox.Essentials.dll_1205939788
TomsToolbox.ObservableCollections.dll_75279310
TomsToolbox.Wpf.dll_28003915
TomsToolbox.Wpf.Styles.dll_1483228554
25 changes: 25 additions & 0 deletions BuildTools/create-filelists.ps1
View file
@@ -0,0 +1,25 @@
$ErrorActionPreference = "Stop";

$Utf8NoBomEncoding = New-Object System.Text.UTF8Encoding $False

gci -Include *.vsix, *.msi -recurse | foreach ($_) {
if (-not ($_.FullName -contains "\bin\Debug\")) {
continue;
}
$idx=-1;
$body=$false;
$outputFileName = ".\BuildTools\$($_.Name -replace '-\d+\.\d+\.\d+\.\d+', '').filelist";
$lines = 7z l $_.FullName | foreach {
if ($idx -eq -1) {
$idx = $_.IndexOf("Name");
}
$p = $body;
if ($idx -gt 0) {
$body = ($body -ne ($_ -match ' *-[ -]+'))
}
if ($p -and $body) {
$_.Substring($idx)
}
} | sort
[System.IO.File]::WriteAllLines($outputFileName, $lines, $Utf8NoBomEncoding)
}
1 change: 1 addition & 0 deletions ILSpy.Installer/setup.cs
View file
Expand Up @@ -26,6 +26,7 @@ static public void Main()
new DirFiles(Path.Combine(buildOutputDir, "*.dll")),
new DirFiles(Path.Combine(buildOutputDir, "*.exe")),
new DirFiles(Path.Combine(buildOutputDir, "*.config")),
new DirFiles(Path.Combine(buildOutputDir, "*.json")),
new Files(Path.Combine(buildOutputDir, "ILSpy.resources.dll")),
new Files(Path.Combine(buildOutputDir, "ILSpy.ReadyToRun.Plugin.resources.dll"))));

Expand Down

0 comments on commit 78c7ece

Please sign in to comment.