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

Generate nuget packages for Arm64 build #6000

Merged
gkhanna79 merged 2 commits into from
Jun 29, 2016
Merged

Generate nuget packages for Arm64 build #6000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ff3d83
Change to Generate nuget packages for Windows Arm64 builds.
gkhanna79 Jun 24, 2016
6983352
Package native Arm64 crossgen as well.
gkhanna79 Jun 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,6 @@ if %errorlevel% NEQ 0 (
:SkipCoreLibBuild

:GenerateNuget
if /i "%__BuildArch%" =="arm64" goto :SkipNuget
if /i "%__SkipBuildPackages%" == 1 goto :SkipNuget

set "__BuildLog=%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
Expand Down
Empty file added cmake.definitions
View file
Open in desktop
Empty file.
10 changes: 9 additions & 1 deletion dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<PackageThirdPartyNoticesFile>$(SourceDir).nuget/ThirdPartyNotices.txt</PackageThirdPartyNoticesFile>

<!-- This should be kept in sync with package details in src/.nuget/init/project.json -->
<RuntimeIdGraphDefinitionFile>$(PackagesDir)/Microsoft.NETCore.Platforms/1.0.1-rc2-23712/runtime.json</RuntimeIdGraphDefinitionFile>
<RuntimeIdGraphDefinitionFile>$(PackagesDir)/Microsoft.NETCore.Platforms/1.0.2-beta-24224-02/runtime.json</RuntimeIdGraphDefinitionFile>
Copy link
Copy Markdown
Member

@weshaggard weshaggard Jun 28, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is probably worth adding something that will validate that this is updated.

Copy link
Copy Markdown
Member Author

@gkhanna79 gkhanna79 Jun 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like a bot update?

Copy link
Copy Markdown
Member

@weshaggard weshaggard Jun 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes a bot update but also a validation task similar to what we do in corefx to ensure this version agrees with what is in your project.json.

Copy link
Copy Markdown
Member Author

@gkhanna79 gkhanna79 Jun 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please point to it?

Copy link
Copy Markdown
Member

@weshaggard weshaggard Jun 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What we do is define the expected version in an msbuild property like such https://github.com/dotnet/corefx/blob/master/dir.props#L101 and then we run the validation task https://github.com/dotnet/corefx/blob/master/build.proj#L108 that will verify the versions we have defined are the versions referenced in all our project.json files.


<!-- This link should be updated for each release milestone, currently this points to 1.1.0-beta -->
<ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes>
Expand All @@ -162,6 +162,14 @@
<!-- defined in buildtools packaging.targets, but we need this before targets are imported -->
<PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
<PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>
<MinOSForArch>win7</MinOSForArch>
<MinOSForArch Condition="'$(PackagePlatform)' == 'arm'">win8</MinOSForArch>
<MinOSForArch Condition="'$(PackagePlatform)' == 'arm64'">win10</MinOSForArch>

<!-- Arm64 cross target components are x64 hosted -->
<HasCrossTargetComponents Condition="'$(PackagePlatform)' =='arm64'">true</HasCrossTargetComponents>
<CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm64'">x64</CrossTargetComponentFolder>

<PackageOutputPath>$(PackagesBinDir)/pkg/</PackageOutputPath>
<SymbolPackageOutputPath>$(PackagesBinDir)/symbolpkg/</SymbolPackageOutputPath>
</PropertyGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<OSGroup>Windows_NT</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>arm64</Platform>
</Project>
<Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>x86</Platform>
Expand Down
5 changes: 4 additions & 1 deletion src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<PackagePlatforms>x64;x86;arm</PackagePlatforms>
<PackagePlatforms>x64;x86;arm64;arm</PackagePlatforms>
<OutputPath>$(PackagesOutputPath)</OutputPath>
<IncludeRuntimeJson>true</IncludeRuntimeJson>
</PropertyGroup>
Expand All @@ -14,6 +14,9 @@
<ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>arm64</Platform>
</ProjectReference>
<ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>x86</Platform>
</ProjectReference>
Expand Down
4 changes: 1 addition & 3 deletions src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
<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>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
</PropertyGroup>
<ItemGroup>
<ArchitectureSpecificNativeFile Include="$(BinDir)ilasm.exe" />
Expand Down
4 changes: 4 additions & 0 deletions src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<OSGroup>Windows_NT</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILDAsm.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>arm64</Platform>
</Project>
<Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILDAsm.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>x86</Platform>
Expand Down
5 changes: 4 additions & 1 deletion src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<PackagePlatforms>x64;x86;arm</PackagePlatforms>
<PackagePlatforms>x64;x86;arm64;arm</PackagePlatforms>
Copy link
Copy Markdown
Member

@weshaggard weshaggard Jun 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

orthogonal but something I notices while reviewing. This claims to support arm but I don't see an arm configuration below.

Copy link
Copy Markdown
Member Author

@gkhanna79 gkhanna79 Jun 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont think it claims to support arm per https://github.com/dotnet/buildtools/blob/3c700d1ecc358c6c1b3ffbaaeb49e7864a8e9ba7/src/Microsoft.DotNet.Build.Tasks.Packaging/src/PackageFiles/Packaging.targets#L125 which expects a trailing ";" to enable the platform.

That said, I will be looking into enabling Arm32 once I am done with this.

<OutputPath>$(PackagesOutputPath)</OutputPath>
<IncludeRuntimeJson>true</IncludeRuntimeJson>
</PropertyGroup>
Expand All @@ -14,6 +14,9 @@
<ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj">
<Platform>arm64</Platform>
</ProjectReference>
<ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj">
<Platform>x86</Platform>
</ProjectReference>
Expand Down
4 changes: 1 addition & 3 deletions src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
<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>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
</PropertyGroup>
<ItemGroup>
<ArchitectureSpecificNativeFile Include="$(BinDir)ildasm.exe" />
Expand Down
4 changes: 4 additions & 0 deletions src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<OSGroup>Windows_NT</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Jit.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>arm64</Platform>
</Project>
<Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Jit.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>x86</Platform>
Expand Down
5 changes: 4 additions & 1 deletion src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,17 @@
<Version>1.0.4</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<PackagePlatforms>x64;x86;arm</PackagePlatforms>
<PackagePlatforms>x64;x86;arm64;arm</PackagePlatforms>
<OutputPath>$(PackagesOutputPath)</OutputPath>
<IncludeRuntimeJson>true</IncludeRuntimeJson>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="win\Microsoft.NETCore.Jit.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="win\Microsoft.NETCore.Jit.pkgproj">
<Platform>arm64</Platform>
</ProjectReference>
<ProjectReference Include="win\Microsoft.NETCore.Jit.pkgproj">
<Platform>x86</Platform>
</ProjectReference>
Expand Down
3 changes: 1 addition & 2 deletions src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<PropertyGroup>
<Version>1.0.4</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<MinOSForArch>win7</MinOSForArch>
<MinOSForArch Condition="$(PackagePlatform.StartsWith('arm'))">win8</MinOSForArch>
<PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
</PropertyGroup>
<ItemGroup>
<ArchitectureSpecificNativeFile Include="$(BinDir)clrjit.dll" />
Expand Down
4 changes: 4 additions & 0 deletions src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<OSGroup>Windows_NT</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>arm64</Platform>
</Project>
<Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>x86</Platform>
Expand Down
5 changes: 4 additions & 1 deletion src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Version>1.0.4</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<PackagePlatforms>x64;x86;arm</PackagePlatforms>
<PackagePlatforms>x64;x86;arm64;arm</PackagePlatforms>
<OutputPath>$(PackagesOutputPath)</OutputPath>
<IncludeRuntimeJson>true</IncludeRuntimeJson>
</PropertyGroup>
Expand All @@ -24,6 +24,9 @@
<ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
<Platform>arm64</Platform>
</ProjectReference>
<ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
<Platform>x86</Platform>
</ProjectReference>
Expand Down
16 changes: 13 additions & 3 deletions src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<Version>1.0.4</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<MinOSForArch>win7</MinOSForArch>
<MinOSForArch Condition="$(PackagePlatform.StartsWith('arm'))">win8</MinOSForArch>
<PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
</PropertyGroup>
<ItemGroup>
<ArchitectureSpecificNativeFileAndSymbol Include="$(BinDir)clretwrc.dll" />
Expand All @@ -22,6 +20,10 @@
<ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" />
<ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" />
<ArchitectureSpecificToolFile Include="$(BinDir)crossgen.exe" />
<CrossArchitectureSpecificToolFile Include="$(BinDir)$(CrossTargetComponentFolder)\crossgen.exe" />
<CrossArchitectureSpecificToolFile Include="$(BinDir)$(CrossTargetComponentFolder)\mscordaccore.dll" />
<CrossArchitectureSpecificToolFile Include="$(BinDir)$(CrossTargetComponentFolder)\mscordbi.dll" />
<CrossArchitectureSpecificToolFile Include="$(BinDir)$(CrossTargetComponentFolder)\sos.dll" />
<ArchitectureSpecificNativeFile Include="@(ArchitectureSpecificNativeFileAndSymbol)" />
<File Include="@(ArchitectureSpecificNativeFile)">
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
Expand All @@ -33,6 +35,9 @@
<File Include="@(ArchitectureSpecificToolFile)">
<TargetPath>tools</TargetPath>
</File>
<File Condition="'$(HasCrossTargetComponents)' == 'true'" Include="@(CrossArchitectureSpecificToolFile)">
<TargetPath>tools/$(CrossTargetComponentFolder)_$(PackagePlatform)</TargetPath>
</File>
<!-- prevent accidental inclusion in AOT projects. -->
<File Include="$(PlaceholderFile)">
<TargetPath>runtimes/$(PackageTargetRuntime)-aot/lib/netstandard1.0</TargetPath>
Expand All @@ -48,10 +53,15 @@
<ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificNativeFileAndSymbol -> '%(RelativeDir)PDB\%(FileName).pdb')" />
<ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificLibFile -> '%(RelativeDir)PDB\%(FileName).pdb')" />
<ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificToolFile -> '%(RelativeDir)PDB\%(FileName).pdb')" />
<CrossArchitectureSpecificNativeSymbol Condition="'$(HasCrossTargetComponents)' == 'true'" Include="@(CrossArchitectureSpecificToolFile -> '%(RelativeDir)PDB\%(FileName).pdb')" />
<File Include="@(ArchitectureSpecificNativeSymbol)">
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
<IsSymbolFile>true</IsSymbolFile>
</File>
<File Condition="'$(HasCrossTargetComponents)' == 'true'" Include="@(CrossArchitectureSpecificNativeSymbol)">
<TargetPath>tools/$(CrossTargetComponentFolder)_$(PackagePlatform)</TargetPath>
<IsSymbolFile>true</IsSymbolFile>
</File>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
2 changes: 1 addition & 1 deletion src/.nuget/init/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23712",
"Microsoft.NETCore.Platforms": "1.0.2-beta-24224-02",
},
"frameworks": {
"dnxcore50": {
Expand Down