Skip to content
Permalink
Browse files

[Build] Use win instead of win7 runtime identifier

  • Loading branch information
xen2 committed Dec 20, 2018
1 parent 37ffe2e commit 799442a9778a9431f4eee1aadd5a4a69e1aabab9
@@ -331,7 +331,7 @@ public async Task<NugetLocalPackage> InstallPackage(string packageId, PackageVer
var provider = RestoreCommandProviders.Create(installPath, new List<string>(), sourceRepositoryProvider.GetRepositories(), context, new LocalPackageFileCache(), NativeLogger);
var request = new RestoreRequest(spec, provider, context, null, NativeLogger)
{
//RequestedRuntimes = { "win7-d3d11" },
//RequestedRuntimes = { "win-d3d11" },
ProjectStyle = ProjectStyle.DotnetCliTool,
};

@@ -1,38 +1,40 @@
{
"runtimes": {
"win7": {
"win": {
"#import": [
"win7-d3d11"
"win-d3d11",
"any"
]
},
"win7-d3d11": {
"win-d3d11": {
"#import": [
"win7"
"win"
]
},
"win7-d3d12": {
"win-d3d12": {
"#import": [
"win7"
"win"
]
},
"win7-opengl": {
"win-opengl": {
"#import": [
"win7"
"win"
]
},
"win7-opengles": {
"win-opengles": {
"#import": [
"win7"
"win"
]
},
"win7-vulkan": {
"win-vulkan": {
"#import": [
"win7"
"win"
]
},
"linux": {
"#import": [
"linux-opengl"
"linux-opengl",
"unix"
]
},
"linux-opengl": {
@@ -28,7 +28,7 @@ public static List<string> ListAssemblies(RestoreRequest request, RestoreResult
foreach (var library in result.LockFile.Libraries)
{
// Try several known path (note: order matters)
foreach (var startPattern in new[] { "runtimes/win7-d3d11/lib/net4", "runtimes/win/lib/net4", "lib/net4", "lib/net35", "lib/netstandard2.", "lib/netstandard1.", "lib/net10" })
foreach (var startPattern in new[] { "runtimes/win-d3d11/lib/net4", "runtimes/win/lib/net4", "lib/net4", "lib/net35", "lib/netstandard2.", "lib/netstandard1.", "lib/net10" })
{
foreach (var file in library.Files)
{
@@ -24,20 +24,20 @@

<!-- Include platform dependent assembly when specified -->
<PropertyGroup Condition="'$(XenkoGraphicsApiDependent)' == 'true' And '$(XenkoGraphicsApiDependentBuildAll)' == 'true'">
<RuntimeIdentifiers Condition="'$(TargetFramework)' == 'net45'">win7-d3d11;win7-d3d12;win7-opengl;win7-opengles;win7-vulkan</RuntimeIdentifiers>
<RuntimeIdentifierDefault Condition="'$(TargetFramework)' == 'net45'">win7-d3d11</RuntimeIdentifierDefault>
<RuntimeIdentifiers Condition="'$(TargetFramework)' == 'net45'">win-d3d11;win-d3d12;win-opengl;win-opengles;win-vulkan</RuntimeIdentifiers>
<RuntimeIdentifierDefault Condition="'$(TargetFramework)' == 'net45'">win-d3d11</RuntimeIdentifierDefault>
<RuntimeIdentifiers Condition="'$(TargetFramework)' == 'netstandard2.0'">linux-opengl;linux-vulkan</RuntimeIdentifiers>
<RuntimeIdentifierDefault Condition="'$(TargetFramework)' == 'netstandard2.0'">linux-opengl</RuntimeIdentifierDefault>

<ExtrasBuildEachRuntimeIdentifier Condition="'$(RuntimeIdentifiers)' != ''">true</ExtrasBuildEachRuntimeIdentifier>
<DisableFastUpToDateCheck Condition="$(RuntimeIdentifiers.Contains(';'))">true</DisableFastUpToDateCheck>
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' And '$(RuntimeIdentifierDefault)' != ''">$(RuntimeIdentifierDefault)</RuntimeIdentifier>

<XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win7-d3d11'">Direct3D11</XenkoGraphicsApi>
<XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win7-d3d12'">Direct3D12</XenkoGraphicsApi>
<XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win7-opengl'">OpenGL</XenkoGraphicsApi>
<XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win7-opengles'">OpenGLES</XenkoGraphicsApi>
<XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win7-vulkan'">Vulkan</XenkoGraphicsApi>
<XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win-d3d11'">Direct3D11</XenkoGraphicsApi>
<XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win-d3d12'">Direct3D12</XenkoGraphicsApi>
<XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win-opengl'">OpenGL</XenkoGraphicsApi>
<XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win-opengles'">OpenGLES</XenkoGraphicsApi>
<XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win-vulkan'">Vulkan</XenkoGraphicsApi>

<XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'linux-opengl'">OpenGL</XenkoGraphicsApi>
<XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'linux-vulkan'">Vulkan</XenkoGraphicsApi>

0 comments on commit 799442a

Please sign in to comment.
You can’t perform that action at this time.