Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit abfd2cd

Browse files
author
Ian Hays
authored
Merge pull request #17516 from ianhays/1.1_pkgfed28deb9
[1.1] Add packaging for Fedora28 and Debian9
2 parents 327939c + 571e15b commit abfd2cd

25 files changed

+424
-10
lines changed

‎src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
<OSGroup>Windows_NT</OSGroup>
2828
<Platform>arm</Platform>
2929
</Project>
30-
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.ILAsm.pkgproj">
30+
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/8/Microsoft.NETCore.ILAsm.pkgproj">
31+
<OSGroup>Linux</OSGroup>
32+
<Platform>amd64</Platform>
33+
</Project>
34+
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.9-x64'" Include="debian/9/Microsoft.NETCore.ILAsm.pkgproj">
3135
<OSGroup>Linux</OSGroup>
3236
<Platform>amd64</Platform>
3337
</Project>
@@ -43,6 +47,10 @@
4347
<OSGroup>Linux</OSGroup>
4448
<Platform>amd64</Platform>
4549
</Project>
50+
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.28-x64'" Include="fedora/28/Microsoft.NETCore.ILAsm.pkgproj">
51+
<OSGroup>Linux</OSGroup>
52+
<Platform>amd64</Platform>
53+
</Project>
4654
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj">
4755
<OSGroup>Linux</OSGroup>
4856
<Platform>amd64</Platform>

‎src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
<ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
2323
<Platform>arm</Platform>
2424
</ProjectReference>
25-
<ProjectReference Include="debian\Microsoft.NETCore.ILAsm.pkgproj">
25+
<ProjectReference Include="debian\8\Microsoft.NETCore.ILAsm.pkgproj">
26+
<Platform>amd64</Platform>
27+
</ProjectReference>
28+
<ProjectReference Include="debian\9\Microsoft.NETCore.ILAsm.pkgproj">
2629
<Platform>amd64</Platform>
2730
</ProjectReference>
2831
<ProjectReference Include="fedora\23\Microsoft.NETCore.ILAsm.pkgproj">
@@ -34,6 +37,9 @@
3437
<ProjectReference Include="fedora\27\Microsoft.NETCore.ILAsm.pkgproj">
3538
<Platform>amd64</Platform>
3639
</ProjectReference>
40+
<ProjectReference Include="fedora\28\Microsoft.NETCore.ILAsm.pkgproj">
41+
<Platform>amd64</Platform>
42+
</ProjectReference>
3743
<ProjectReference Include="opensuse\13.2\Microsoft.NETCore.ILAsm.pkgproj">
3844
<Platform>amd64</Platform>
3945
</ProjectReference>

‎src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj‎ renamed to ‎src/.nuget/Microsoft.NETCore.ILAsm/debian/8/Microsoft.NETCore.ILAsm.pkgproj‎

File renamed without changes.

‎src/.nuget/Microsoft.NETCore.ILAsm/debian/9/Microsoft.NETCore.ILAsm.pkgproj‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
4+
<PropertyGroup>
5+
<SkipPackageFileCheck>true</SkipPackageFileCheck>
6+
<PackageTargetRuntime>debian.9-$(PackagePlatform)</PackageTargetRuntime>
7+
<!-- only build for x64 -->
8+
<PackagePlatforms>x64;</PackagePlatforms>
9+
</PropertyGroup>
10+
<ItemGroup>
11+
<NativeSplittableBinary Include="$(BinDir)ilasm" />
12+
<ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" />
13+
<File Include="@(ArchitectureSpecificNativeFile)">
14+
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
15+
</File>
16+
</ItemGroup>
17+
<ItemGroup Condition="'$(__BuildType)' == 'Release'">
18+
<ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" />
19+
<AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" />
20+
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" />
21+
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
22+
<ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" />
23+
<File Include="@(ArchitectureSpecificNativeSymbol)">
24+
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
25+
<IsSymbolFile>true</IsSymbolFile>
26+
</File>
27+
</ItemGroup>
28+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
29+
</Project>

‎src/.nuget/Microsoft.NETCore.ILAsm/fedora/28/Microsoft.NETCore.ILAsm.pkgproj‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
4+
<PropertyGroup>
5+
<SkipPackageFileCheck>true</SkipPackageFileCheck>
6+
<PackageTargetRuntime>fedora.28-$(PackagePlatform)</PackageTargetRuntime>
7+
<!-- only build for x64 -->
8+
<PackagePlatforms>x64;</PackagePlatforms>
9+
</PropertyGroup>
10+
<ItemGroup>
11+
<NativeSplittableBinary Include="$(BinDir)ilasm" />
12+
<ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" />
13+
<File Include="@(ArchitectureSpecificNativeFile)">
14+
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
15+
</File>
16+
</ItemGroup>
17+
<ItemGroup Condition="'$(__BuildType)' == 'Release'">
18+
<ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" />
19+
<AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" />
20+
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" />
21+
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
22+
<ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" />
23+
<File Include="@(ArchitectureSpecificNativeSymbol)">
24+
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
25+
<IsSymbolFile>true</IsSymbolFile>
26+
</File>
27+
</ItemGroup>
28+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
29+
</Project>

‎src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
<OSGroup>Windows_NT</OSGroup>
2828
<Platform>arm</Platform>
2929
</Project>
30-
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.ILDAsm.pkgproj">
30+
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/8/Microsoft.NETCore.ILDAsm.pkgproj">
31+
<OSGroup>Linux</OSGroup>
32+
<Platform>amd64</Platform>
33+
</Project>
34+
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.9-x64'" Include="debian/9/Microsoft.NETCore.ILDAsm.pkgproj">
3135
<OSGroup>Linux</OSGroup>
3236
<Platform>amd64</Platform>
3337
</Project>
@@ -43,6 +47,10 @@
4347
<OSGroup>Linux</OSGroup>
4448
<Platform>amd64</Platform>
4549
</Project>
50+
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.28-x64'" Include="fedora/28/Microsoft.NETCore.ILDAsm.pkgproj">
51+
<OSGroup>Linux</OSGroup>
52+
<Platform>amd64</Platform>
53+
</Project>
4654
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj">
4755
<OSGroup>Linux</OSGroup>
4856
<Platform>amd64</Platform>

‎src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
<ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj">
2323
<Platform>arm</Platform>
2424
</ProjectReference>
25-
<ProjectReference Include="debian\Microsoft.NETCore.ILDAsm.pkgproj">
25+
<ProjectReference Include="debian\8\Microsoft.NETCore.ILDAsm.pkgproj">
26+
<Platform>amd64</Platform>
27+
</ProjectReference>
28+
<ProjectReference Include="debian\9\Microsoft.NETCore.ILDAsm.pkgproj">
2629
<Platform>amd64</Platform>
2730
</ProjectReference>
2831
<ProjectReference Include="fedora\23\Microsoft.NETCore.ILDAsm.pkgproj">
@@ -34,6 +37,9 @@
3437
<ProjectReference Include="fedora\27\Microsoft.NETCore.ILDAsm.pkgproj">
3538
<Platform>amd64</Platform>
3639
</ProjectReference>
40+
<ProjectReference Include="fedora\28\Microsoft.NETCore.ILDAsm.pkgproj">
41+
<Platform>amd64</Platform>
42+
</ProjectReference>
3743
<ProjectReference Include="opensuse\13.2\Microsoft.NETCore.ILDAsm.pkgproj">
3844
<Platform>amd64</Platform>
3945
</ProjectReference>

‎src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj‎ renamed to ‎src/.nuget/Microsoft.NETCore.ILDAsm/debian/8/Microsoft.NETCore.ILDAsm.pkgproj‎

File renamed without changes.

‎src/.nuget/Microsoft.NETCore.ILDAsm/debian/9/Microsoft.NETCore.ILDAsm.pkgproj‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
4+
<PropertyGroup>
5+
<SkipPackageFileCheck>true</SkipPackageFileCheck>
6+
<PackageTargetRuntime>debian.9-$(PackagePlatform)</PackageTargetRuntime>
7+
<!-- only build for x64 -->
8+
<PackagePlatforms>x64;</PackagePlatforms>
9+
</PropertyGroup>
10+
<ItemGroup>
11+
<NativeSplittableBinary Include="$(BinDir)ildasm" />
12+
<ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" />
13+
<File Include="@(ArchitectureSpecificNativeFile)">
14+
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
15+
</File>
16+
</ItemGroup>
17+
<ItemGroup Condition="'$(__BuildType)' == 'Release'">
18+
<ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" />
19+
<AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" />
20+
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" />
21+
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
22+
<ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" />
23+
<File Include="@(ArchitectureSpecificNativeSymbol)">
24+
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
25+
<IsSymbolFile>true</IsSymbolFile>
26+
</File>
27+
</ItemGroup>
28+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
29+
</Project>

‎src/.nuget/Microsoft.NETCore.ILDAsm/fedora/28/Microsoft.NETCore.ILDAsm.pkgproj‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
4+
<PropertyGroup>
5+
<SkipPackageFileCheck>true</SkipPackageFileCheck>
6+
<PackageTargetRuntime>fedora.28-$(PackagePlatform)</PackageTargetRuntime>
7+
<!-- only build for x64 -->
8+
<PackagePlatforms>x64;</PackagePlatforms>
9+
</PropertyGroup>
10+
<ItemGroup>
11+
<NativeSplittableBinary Include="$(BinDir)ildasm" />
12+
<ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" />
13+
<File Include="@(ArchitectureSpecificNativeFile)">
14+
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
15+
</File>
16+
</ItemGroup>
17+
<ItemGroup Condition="'$(__BuildType)' == 'Release'">
18+
<ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" />
19+
<AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" />
20+
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" />
21+
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
22+
<ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" />
23+
<File Include="@(ArchitectureSpecificNativeSymbol)">
24+
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
25+
<IsSymbolFile>true</IsSymbolFile>
26+
</File>
27+
</ItemGroup>
28+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
29+
</Project>

0 commit comments

Comments
 (0)