diff --git a/build.cmd b/build.cmd
index c1d5114ba4c2..3167d53fb2be 100644
--- a/build.cmd
+++ b/build.cmd
@@ -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"
diff --git a/cmake.definitions b/cmake.definitions
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/dir.props b/dir.props
index a46fb65af4e2..3aa767137d64 100644
--- a/dir.props
+++ b/dir.props
@@ -144,7 +144,7 @@
$(SourceDir).nuget/ThirdPartyNotices.txt
- $(PackagesDir)/Microsoft.NETCore.Platforms/1.0.1-rc2-23712/runtime.json
+ $(PackagesDir)/Microsoft.NETCore.Platforms/1.0.2-beta-24224-02/runtime.json
https://go.microsoft.com/fwlink/?LinkID=799421
@@ -162,6 +162,14 @@
$(Platform)
x64
+ win7
+ win8
+ win10
+
+
+ true
+ x64
+
$(PackagesBinDir)/pkg/
$(PackagesBinDir)/symbolpkg/
diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds
index ff5bc807d2e8..c98d8762368f 100644
--- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds
+++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds
@@ -15,6 +15,10 @@
Windows_NT
amd64
+
+ Windows_NT
+ arm64
+
Windows_NT
x86
diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
index 8c8c301101a3..9d55a02fa278 100644
--- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
@@ -5,7 +5,7 @@
1.0.3
true
true
- x64;x86;arm
+ x64;x86;arm64;arm
$(PackagesOutputPath)
true
@@ -14,6 +14,9 @@
amd64
+
+ arm64
+
x86
diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj
index 6d7371778aac..e9c96ea723c7 100644
--- a/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj
@@ -3,10 +3,8 @@
1.0.3
- true
- win7
- win8
$(MinOSForArch)-$(PackagePlatform)
+ true
diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds
index 30694e9fb939..0152167fbbb7 100644
--- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds
+++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds
@@ -15,6 +15,10 @@
Windows_NT
amd64
+
+ Windows_NT
+ arm64
+
Windows_NT
x86
diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
index 58f1edf5fc61..86785a539cf4 100644
--- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
@@ -5,7 +5,7 @@
1.0.3
true
true
- x64;x86;arm
+ x64;x86;arm64;arm
$(PackagesOutputPath)
true
@@ -14,6 +14,9 @@
amd64
+
+ arm64
+
x86
diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj
index 87903799403f..241fccdaae2d 100644
--- a/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj
@@ -3,10 +3,8 @@
1.0.3
- true
- win7
- win8
$(MinOSForArch)-$(PackagePlatform)
+ true
diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds
index f742b4906d54..6e3ebfb7ba9e 100644
--- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds
+++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds
@@ -15,6 +15,10 @@
Windows_NT
amd64
+
+ Windows_NT
+ arm64
+
Windows_NT
x86
diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj
index 171b8c833cbe..7903875aef18 100644
--- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj
@@ -5,7 +5,7 @@
1.0.4
true
true
- x64;x86;arm
+ x64;x86;arm64;arm
$(PackagesOutputPath)
true
@@ -13,6 +13,9 @@
amd64
+
+ arm64
+
x86
diff --git a/src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj
index 5c301404ef3f..fd799b10dda5 100644
--- a/src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj
@@ -4,9 +4,8 @@
1.0.4
true
- win7
- win8
$(MinOSForArch)-$(PackagePlatform)
+ true
diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds
index fe468ecfad0a..39ace1a582d6 100644
--- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds
+++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds
@@ -15,6 +15,10 @@
Windows_NT
amd64
+
+ Windows_NT
+ arm64
+
Windows_NT
x86
diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
index 887dc342cc81..4d437dde4e39 100644
--- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
@@ -5,7 +5,7 @@
1.0.4
true
true
- x64;x86;arm
+ x64;x86;arm64;arm
$(PackagesOutputPath)
true
@@ -24,6 +24,9 @@
amd64
+
+ arm64
+
x86
diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
index 177b95376d9a..d9780d730a22 100644
--- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
@@ -3,10 +3,8 @@
1.0.4
- true
- win7
- win8
$(MinOSForArch)-$(PackagePlatform)
+ true
@@ -22,6 +20,10 @@
+
+
+
+
runtimes/$(PackageTargetRuntime)/native
@@ -30,9 +32,12 @@
runtimes/$(PackageTargetRuntime)/lib/netstandard1.0
-
+
tools
+
+ tools/$(CrossTargetComponentFolder)_$(PackagePlatform)
+
runtimes/$(PackageTargetRuntime)-aot/lib/netstandard1.0
@@ -48,10 +53,15 @@
+
runtimes/$(PackageTargetRuntime)/native
true
+
+ tools/$(CrossTargetComponentFolder)_$(PackagePlatform)
+ true
+
diff --git a/src/.nuget/init/project.json b/src/.nuget/init/project.json
index 4a4bc0d7e205..5440fde0de23 100644
--- a/src/.nuget/init/project.json
+++ b/src/.nuget/init/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.0.1-rc2-23712",
+ "Microsoft.NETCore.Platforms": "1.0.2-beta-24224-02",
},
"frameworks": {
"dnxcore50": {