diff options
author | Kyungwoo Lee <kyulee@microsoft.com> | 2016-05-23 15:33:23 -0700 |
---|---|---|
committer | Kyungwoo Lee <kyulee@microsoft.com> | 2016-05-23 19:10:13 -0700 |
commit | 877352fc1e5498f31f552300f07010a7377b1e88 (patch) | |
tree | a81348ef2be41786735133e5777621ec46b653b3 | |
parent | a2d24aa4e65c8de05c1d760c4be7e7537378f3ed (diff) | |
download | coreclr-877352fc1e5498f31f552300f07010a7377b1e88.tar.gz coreclr-877352fc1e5498f31f552300f07010a7377b1e88.tar.bz2 coreclr-877352fc1e5498f31f552300f07010a7377b1e88.zip |
ILAsm/ILDAsm Package
Fixes #5172
This has dependency on CoreCLR.
Use the same version 1.0.3 as CoreCLR.
Tested both packages are produced in Windows/Linux locally.
25 files changed, 686 insertions, 2 deletions
diff --git a/build-packages.cmd b/build-packages.cmd index 0ae96fe911..5429581956 100644 --- a/build-packages.cmd +++ b/build-packages.cmd @@ -33,6 +33,23 @@ if NOT [!ERRORLEVEL!]==[0] ( exit /b 1 ) +rem Build the ILAsm package +set __msbuildArgs="%__ProjectDir%\src\.nuget\Microsoft.NETCore.ILAsm\Microsoft.NETCore.ILAsm.builds" !allargs! +echo msbuild.exe %__msbuildArgs% !options! >> %packagesLog% +call msbuild.exe %__msbuildArgs% !options! +if NOT [!ERRORLEVEL!]==[0] ( + echo ERROR: An error occurred while building packages, see %packagesLog% for more details. + exit /b 1 +) + +rem Build the ILDAsm package +set __msbuildArgs="%__ProjectDir%\src\.nuget\Microsoft.NETCore.ILDAsm\Microsoft.NETCore.ILDAsm.builds" !allargs! +echo msbuild.exe %__msbuildArgs% !options! >> %packagesLog% +call msbuild.exe %__msbuildArgs% !options! +if NOT [!ERRORLEVEL!]==[0] ( + echo ERROR: An error occurred while building packages, see %packagesLog% for more details. + exit /b 1 +) echo Done Building Packages. exit /b @@ -44,4 +61,4 @@ echo The following properties are required to define build architecture echo /p:__BuildArch=[architecture] /p:__BuildType=[configuration] echo Architecture can be x64, x86, arm, or arm64 echo Configuration can be Release, Debug, or Checked -exit /b
\ No newline at end of file +exit /b diff --git a/build-packages.sh b/build-packages.sh index 471b9ef819..c6580bd00d 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -143,6 +143,24 @@ if [ $? -ne 0 ]; then exit 1 fi + # Build the ILAsm package + $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$binclashlog" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:BuildNugetPackage=false /p:UseSharedCompilation=false + +if [ $? -ne 0 ]; then + echo -e "\nAn error occurred. Aborting build-packages.sh ." >> $build_packages_log + echo "ERROR: An error occurred while building packages, see $build_packages_log for more details." + exit 1 +fi + + # Build the ILDAsm package + $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$binclashlog" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:BuildNugetPackage=false /p:UseSharedCompilation=false + +if [ $? -ne 0 ]; then + echo -e "\nAn error occurred. Aborting build-packages.sh ." >> $build_packages_log + echo "ERROR: An error occurred while building packages, see $build_packages_log for more details." + exit 1 +fi + echo "Done building packages." echo -e "\nDone building packages." >> $build_packages_log -exit 0
\ No newline at end of file +exit 0 @@ -515,6 +515,28 @@ if not defined __SkipNativeBuild ( ) ) +rem Build the ILAsm package +set __msbuildArgs="%__ProjectFilesDir%\src\.nuget\Microsoft.NETCore.ILAsm\Microsoft.NETCore.ILAsm.builds" /p:Platform=%__BuildArch% +%_msbuildexe% %__msbuildArgs% %__msbuildLogArgs% +if errorlevel 1 ( + echo %__MsgPrefix%Error: ILAsm Nuget package generation failed build failed. Refer to the build log files for details: + echo %__BuildLog% + echo %__BuildWrn% + echo %__BuildErr% + exit /b 1 +) + +rem Build the ILDAsm package +set __msbuildArgs="%__ProjectFilesDir%\src\.nuget\Microsoft.NETCore.ILDAsm\Microsoft.NETCore.ILDAsm.builds" /p:Platform=%__BuildArch% +%_msbuildexe% %__msbuildArgs% %__msbuildLogArgs% +if errorlevel 1 ( + echo %__MsgPrefix%Error: ILDAsm Nuget package generation failed build failed. Refer to the build log files for details: + echo %__BuildLog% + echo %__BuildWrn% + echo %__BuildErr% + exit /b 1 +) + :SkipNuget REM endlocal to rid us of environment changes from vsdevenv.bat @@ -351,6 +351,22 @@ generate_NugetPackages() echo "Failed to generate Nuget packages." exit 1 fi + + # Build the ILAsm package + $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.log" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:BuildNugetPackage=false /p:__RootBinDir=$__RootBinDir /p:UseSharedCompilation=false + + if [ $? -ne 0 ]; then + echo "Failed to generate ILAsm Nuget packages." + exit 1 + fi + + # Build the ILDAsm package + $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.log" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:BuildNugetPackage=false /p:__RootBinDir=$__RootBinDir /p:UseSharedCompilation=false + + if [ $? -ne 0 ]; then + echo "Failed to generate ILDAsm Nuget packages." + exit 1 + fi } echo "Commencing CoreCLR Repo build" diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds new file mode 100644 index 0000000000..2d45d6bd27 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. --> + <OutputPath>$(PackageOutputPath)</OutputPath> + </PropertyGroup> + + <!-- We always build the identity/redirection package. However, the platform specific runtime-*.nupkg is built based upon the target OS we are building the product for. --> + <ItemGroup> + <Project Include="Microsoft.NETCore.ILAsm.pkgproj"> + </Project> + <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>Windows_NT</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>Windows_NT</OSGroup> + <Platform>x86</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'rhel'" Include="rhel/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'debian'" Include="debian/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'ubuntu'" Include="ubuntu/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>OSX</OSGroup> + <Platform>amd64</Platform> + </Project> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj new file mode 100644 index 0000000000..bf1ab5d800 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.3</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <SkipValidatePackage>true</SkipValidatePackage> + <PackagePlatforms>x64;x86;arm</PackagePlatforms> + <OutputPath>$(PackagesOutputPath)</OutputPath> + <IncludeRuntimeJson>true</IncludeRuntimeJson> + </PropertyGroup> + + <ItemGroup> + <Dependency Include="Microsoft.NETCore.Runtime.CoreCLR"> + <Version>1.0.3$(VersionSuffix)</Version> + </Dependency> + <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>x86</Platform> + </ProjectReference> + <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> + <ProjectReference Include="rhel\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="debian\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="osx\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="ubuntu\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/_.pdb b/src/.nuget/Microsoft.NETCore.ILAsm/_.pdb new file mode 100644 index 0000000000..139597f9cb --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/_.pdb @@ -0,0 +1,2 @@ + + diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj new file mode 100644 index 0000000000..7914ae7dae --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.3</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>debian.8-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ilasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/descriptions.json b/src/.nuget/Microsoft.NETCore.ILAsm/descriptions.json new file mode 100644 index 0000000000..7f6e156dd3 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/descriptions.json @@ -0,0 +1,17 @@ +[ + { + "Name": "RuntimePackage", + "Description": "Internal implementation package not meant for direct consumption. Please do not reference directly.", + "CommonTypes": [ ] + }, + { + "Name": "NuGet3MinVersion", + "Description": "When using NuGet 3.x this package requires at least version {0}.", + "CommonTypes": [ ] + }, + { + "Name": "Microsoft.NETCore.ILAsm", + "Description": "The .NET IL Assembler.", + "CommonTypes": [ ] + } +] diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/dir.props b/src/.nuget/Microsoft.NETCore.ILAsm/dir.props new file mode 100644 index 0000000000..5182fee111 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/dir.props @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., dir.props))\dir.props" /> + + <!-- Packaging properties --> + <PropertyGroup> + <PreReleaseLabel>rc4</PreReleaseLabel> + <PackageDescriptionFile>$(MSBuildThisFileDirectory)descriptions.json</PackageDescriptionFile> + + <!-- NOTE: for various required properties, we use the values from the imported dir.props. --> + </PropertyGroup> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj new file mode 100644 index 0000000000..b3ade26380 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.3</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ilasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dwarf')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj new file mode 100644 index 0000000000..2490154aec --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.3</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ilasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/Microsoft.NETCore.ILAsm.pkgproj new file mode 100644 index 0000000000..35f27efa16 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/Microsoft.NETCore.ILAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.3</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ilasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj new file mode 100644 index 0000000000..700346b6d1 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.3</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <MinOSForArch>win7</MinOSForArch> + <MinOSForArch Condition="$(PackagePlatform.StartsWith('arm'))">win8</MinOSForArch> + <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime> + </PropertyGroup> + + <ItemGroup> + <ArchitectureSpecificNativeFile Include="$(BinDir)ilasm.exe"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup> + <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificNativeFile -> '%(RelativeDir)PDB\%(FileName).pdb')"/> + + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds new file mode 100644 index 0000000000..dc741833ea --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. --> + <OutputPath>$(PackageOutputPath)</OutputPath> + </PropertyGroup> + + <!-- We always build the identity/redirection package. However, the platform specific runtime-*.nupkg is built based upon the target OS we are building the product for. --> + <ItemGroup> + <Project Include="Microsoft.NETCore.ILDAsm.pkgproj"> + </Project> + <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>Windows_NT</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>Windows_NT</OSGroup> + <Platform>x86</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'rhel'" Include="rhel/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'debian'" Include="debian/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'ubuntu'" Include="ubuntu/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>OSX</OSGroup> + <Platform>amd64</Platform> + </Project> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj new file mode 100644 index 0000000000..ce23761d2d --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.3</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <SkipValidatePackage>true</SkipValidatePackage> + <PackagePlatforms>x64;x86;arm</PackagePlatforms> + <OutputPath>$(PackagesOutputPath)</OutputPath> + <IncludeRuntimeJson>true</IncludeRuntimeJson> + </PropertyGroup> + + <ItemGroup> + <Dependency Include="Microsoft.NETCore.Runtime.CoreCLR"> + <Version>1.0.3$(VersionSuffix)</Version> + </Dependency> + <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>x86</Platform> + </ProjectReference> + <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> + <ProjectReference Include="rhel\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="debian\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="osx\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="ubuntu\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/_.pdb b/src/.nuget/Microsoft.NETCore.ILDAsm/_.pdb new file mode 100644 index 0000000000..139597f9cb --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/_.pdb @@ -0,0 +1,2 @@ + + diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj new file mode 100644 index 0000000000..8458534498 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.3</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>debian.8-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ildasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/descriptions.json b/src/.nuget/Microsoft.NETCore.ILDAsm/descriptions.json new file mode 100644 index 0000000000..3ab2d16f3f --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/descriptions.json @@ -0,0 +1,17 @@ +[ + { + "Name": "RuntimePackage", + "Description": "Internal implementation package not meant for direct consumption. Please do not reference directly.", + "CommonTypes": [ ] + }, + { + "Name": "NuGet3MinVersion", + "Description": "When using NuGet 3.x this package requires at least version {0}.", + "CommonTypes": [ ] + }, + { + "Name": "Microsoft.NETCore.ILDAsm", + "Description": "The .NET IL Disassembler.", + "CommonTypes": [ ] + } +] diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/dir.props b/src/.nuget/Microsoft.NETCore.ILDAsm/dir.props new file mode 100644 index 0000000000..5182fee111 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/dir.props @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., dir.props))\dir.props" /> + + <!-- Packaging properties --> + <PropertyGroup> + <PreReleaseLabel>rc4</PreReleaseLabel> + <PackageDescriptionFile>$(MSBuildThisFileDirectory)descriptions.json</PackageDescriptionFile> + + <!-- NOTE: for various required properties, we use the values from the imported dir.props. --> + </PropertyGroup> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/osx/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/osx/Microsoft.NETCore.ILDAsm.pkgproj new file mode 100644 index 0000000000..d394d7465d --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/osx/Microsoft.NETCore.ILDAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.3</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ildasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dwarf')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj new file mode 100644 index 0000000000..2aa8bbd4b0 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.3</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ildasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/Microsoft.NETCore.ILDAsm.pkgproj new file mode 100644 index 0000000000..847814b956 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/Microsoft.NETCore.ILDAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.3</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ildasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj new file mode 100644 index 0000000000..e575ecf38a --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.3</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <MinOSForArch>win7</MinOSForArch> + <MinOSForArch Condition="$(PackagePlatform.StartsWith('arm'))">win8</MinOSForArch> + <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime> + </PropertyGroup> + + <ItemGroup> + <ArchitectureSpecificNativeFile Include="$(BinDir)ildasm.exe"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)ildasmrc.dll"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup> + <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificNativeFile -> '%(RelativeDir)PDB\%(FileName).pdb')"/> + + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/descriptions.json b/src/.nuget/descriptions.json index 81d22ce820..d4e61281c3 100644 --- a/src/.nuget/descriptions.json +++ b/src/.nuget/descriptions.json @@ -18,5 +18,15 @@ "Name": "Microsoft.TargetingPack.Private.CoreCLR", "Description": "Contains a private targeting pack which contains only the CoreCLR mscorlib reference assembly. Used for producing platform specific libraries such as facades.", "CommonTypes": [ ] + }, + { + "Name": "Microsoft.NETCore.ILAsm", + "Description": "Contains IL Assembly tool", + "CommonTypes": [ ] + }, + { + "Name": "Microsoft.NETCore.ILDAsm", + "Description": "Contains IL Disassembly tool", + "CommonTypes": [ ] } ] |