diff options
| author | Sedar Gokbulut <sedarg@microsoft.com> | 2017-01-12 23:45:08 +0300 |
|---|---|---|
| committer | Sedar Gokbulut <sedarg@microsoft.com> | 2017-01-13 00:01:58 +0300 |
| commit | 8046975c66b48e2ab11b09da2e38e89726d7b989 (patch) | |
| tree | 3bc59637bdd3d97b2b32f7e6ec06a6801b8cab5b | |
| parent | 59133e10e2e13df6943b837f6cc813429e326f6b (diff) | |
Fixing which asset we pick up for System.Runtime
| -rw-r--r-- | src/packaging/packages.targets | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/packaging/packages.targets b/src/packaging/packages.targets index 948263e36..b3926932a 100644 --- a/src/packaging/packages.targets +++ b/src/packaging/packages.targets @@ -112,7 +112,6 @@ <!-- Repackage the CoreCLR framework --> <!-- TODO: Obtain this via nuget once the framework is properly packaged --> - <ILCompilerAnyFrameworkFiles Include="System.Runtime" /> <ILCompilerAnyFrameworkFiles Include="System.Globalization" /> <ILCompilerAnyFrameworkFiles Include="System.Globalization.Calendars" /> <ILCompilerAnyFrameworkFiles Include="System.IO" /> @@ -127,6 +126,7 @@ <Text><![CDATA[ <file src="packages/runtime.any.%(Identity)/$(CoreFxPackageVersion)/lib/netstandard1.7/%(Identity).dll" target="runtimes/$(NuPkgRid)/native/framework/%(Identity).dll" /> ]]></Text> </ILCompilerSdkBinPlace> + <ILCompilerFrameworkFiles Include="runtime.aot.System.Reflection.Primitives/$(CoreFxPackageVersion)/runtimes/aot/lib/uap10.1/System.Reflection.Primitives.dll" /> <ILCompilerFrameworkFiles Include="runtime.aot.System.Runtime.InteropServices/$(CoreFxPackageVersion)/runtimes/aot/lib/uap10.1/System.Runtime.InteropServices.dll" /> <ILCompilerFrameworkFiles Include="runtime.aot.System.Threading.Tasks/$(CoreFxPackageVersion)/runtimes/aot/lib/uap10.1/System.Threading.Tasks.dll" /> @@ -144,6 +144,7 @@ <ILCompilerFrameworkFiles Include="runtime.win7.System.Private.Uri/$(CoreFxPackageVersion)/runtimes/win-corert/lib/netcoreapp1.2/System.Private.Uri.dll" Condition="'$(OsEnvironment)'=='Windows_NT'" /> <ILCompilerFrameworkFiles Include="runtime.unix.System.Private.Uri/$(CoreFxPackageVersion)/runtimes/unix-corert/lib/netcoreapp1.2/System.Private.Uri.dll" Condition="'$(OsEnvironment)'!='Windows_NT'" /> + <ILCompilerFrameworkFiles Include="runtime.any.System.Runtime/$(CoreFXPackageVersion)/runtimes/corert/lib/netcoreapp1.2/System.Runtime.dll" /> <ILCompilerFrameworkFiles Include="runtime.win.System.Runtime.Extensions/$(CoreFxPackageVersion)/runtimes/win-corert/lib/netcoreapp1.2/System.Runtime.Extensions.dll" Condition="'$(OsEnvironment)'=='Windows_NT'" /> <ILCompilerFrameworkFiles Include="runtime.unix.System.Runtime.Extensions/$(CoreFxPackageVersion)/runtimes/unix-corert/lib/netcoreapp1.2/System.Runtime.Extensions.dll" Condition="'$(OsEnvironment)'!='Windows_NT'" /> |