mirror of
https://github.com/ZuneDev/ZuneShell.dll.git
synced 2026-07-27 13:11:51 -07:00
Use ZuneUIXTools as submodule
# Conflicts: # ZuneShell/ZuneShell.csproj # libs/MicrosoftIris
This commit is contained in:
Joshua "Yoshi" Askharoun
+3
-3
@@ -1,3 +1,3 @@
|
||||
[submodule "libs/MicrosoftIris"]
|
||||
path = libs/MicrosoftIris
|
||||
url = https://github.com/ZuneDev/MicrosoftIris
|
||||
[submodule "libs/ZuneUIXTools"]
|
||||
path = libs/ZuneUIXTools
|
||||
url = https://github.com/ZuneDev/ZuneUIXTools
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
|
||||
<When Condition=" $(TargetFramework.StartsWith('net46')) ">
|
||||
<When Condition=" $(TargetFramework.StartsWith('net4')) ">
|
||||
<PropertyGroup>
|
||||
<DefineConstants>$(DefineConstants);WINDOWS;NETSTANDARD1_0_OR_GREATER;NETSTANDARD2_0_OR_GREATER</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\libs\ZuneUIXTools\DebugAdapter\UIX.DebugAdapter.Server\UIX.DebugAdapter.Server.csproj" />
|
||||
<ProjectReference Include="..\libs\ZuneUIXTools\libs\MicrosoftIris\UIX\UIX.csproj" />
|
||||
<ProjectReference Include="..\ZuneShell\ZuneShell.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
+96
-55
@@ -5,10 +5,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZuneShell", "ZuneShell\ZuneShell.csproj", "{E93CFFA3-1EEB-4E71-9E83-7377C1422119}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{7640D6FE-600E-44BE-A59F-E90602FA7754}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIX", "libs\MicrosoftIris\UIX\UIX.csproj", "{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIX.RenderApi", "libs\MicrosoftIris\UIX.RenderApi\UIX.RenderApi.csproj", "{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
libs\ZuneUIXTools\libs\MicrosoftIris\Directory.Build.props = libs\ZuneUIXTools\libs\MicrosoftIris\Directory.Build.props
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZuneHost", "ZuneHost\ZuneHost.csproj", "{4041A91F-EF2A-4C47-9EBE-F4E862532345}"
|
||||
EndProject
|
||||
@@ -23,7 +22,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
|
||||
Directory.Build.props = Directory.Build.props
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIXcontrols", "libs\MicrosoftIris\UIXcontrols\UIXcontrols.csproj", "{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIX", "libs\ZuneUIXTools\libs\MicrosoftIris\UIX\UIX.csproj", "{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIX.RenderApi", "libs\ZuneUIXTools\libs\MicrosoftIris\UIX.RenderApi\UIX.RenderApi.csproj", "{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIXcontrols", "libs\ZuneUIXTools\libs\MicrosoftIris\UIXcontrols\UIXcontrols.csproj", "{AD0B5BAE-5400-8A82-014B-09787DCF364B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIX.DebugAdapter.Shared", "libs\ZuneUIXTools\DebugAdapter\UIX.DebugAdapter.Shared\UIX.DebugAdapter.Shared.csproj", "{6B096019-10F1-3287-4876-BD47D438875C}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIX.DebugAdapter.Server", "libs\ZuneUIXTools\DebugAdapter\UIX.DebugAdapter.Server\UIX.DebugAdapter.Server.csproj", "{6D8340B2-77E8-4032-81AE-4C67753675A6}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
@@ -53,38 +60,6 @@ Global
|
||||
{E93CFFA3-1EEB-4E71-9E83-7377C1422119}.Release|x64.Build.0 = Release|x64
|
||||
{E93CFFA3-1EEB-4E71-9E83-7377C1422119}.Release|x86.ActiveCfg = Release|x86
|
||||
{E93CFFA3-1EEB-4E71-9E83-7377C1422119}.Release|x86.Build.0 = Release|x86
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|ARM32.ActiveCfg = Debug|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|ARM32.Build.0 = Debug|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|x64.Build.0 = Debug|x64
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|x86.Build.0 = Debug|x86
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|ARM32.ActiveCfg = Release|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|ARM32.Build.0 = Release|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|x64.ActiveCfg = Release|x64
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|x64.Build.0 = Release|x64
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|x86.ActiveCfg = Release|x86
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|x86.Build.0 = Release|x86
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|ARM32.ActiveCfg = Debug|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|ARM32.Build.0 = Debug|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|x64.Build.0 = Debug|x64
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|x86.Build.0 = Debug|x86
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|ARM32.ActiveCfg = Release|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|ARM32.Build.0 = Release|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|x64.ActiveCfg = Release|x64
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|x64.Build.0 = Release|x64
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|x86.ActiveCfg = Release|x86
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|x86.Build.0 = Release|x86
|
||||
{4041A91F-EF2A-4C47-9EBE-F4E862532345}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||
{4041A91F-EF2A-4C47-9EBE-F4E862532345}.Debug|Any CPU.Build.0 = Debug|x64
|
||||
{4041A91F-EF2A-4C47-9EBE-F4E862532345}.Debug|ARM32.ActiveCfg = Debug|ARM32
|
||||
@@ -149,31 +124,97 @@ Global
|
||||
{90A89707-927E-48D2-BFEB-84F95F531258}.Release|x64.Build.0 = Release|Any CPU
|
||||
{90A89707-927E-48D2-BFEB-84F95F531258}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{90A89707-927E-48D2-BFEB-84F95F531258}.Release|x86.Build.0 = Release|Any CPU
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|ARM32.ActiveCfg = Debug|Any CPU
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|ARM32.Build.0 = Debug|Any CPU
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|x64.Build.0 = Debug|x64
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|x86.Build.0 = Debug|x86
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|ARM32.ActiveCfg = Release|Any CPU
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|ARM32.Build.0 = Release|Any CPU
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|x64.ActiveCfg = Release|x64
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|x64.Build.0 = Release|x64
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|x86.ActiveCfg = Release|x86
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|x86.Build.0 = Release|x86
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|ARM32.ActiveCfg = Debug|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|ARM32.Build.0 = Debug|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|x64.Build.0 = Debug|x64
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Debug|x86.Build.0 = Debug|x86
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|ARM32.ActiveCfg = Release|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|ARM32.Build.0 = Release|Any CPU
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|x64.ActiveCfg = Release|x64
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|x64.Build.0 = Release|x64
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|x86.ActiveCfg = Release|x86
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}.Release|x86.Build.0 = Release|x86
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|ARM32.ActiveCfg = Debug|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|ARM32.Build.0 = Debug|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|x64.Build.0 = Debug|x64
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Debug|x86.Build.0 = Debug|x86
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|ARM32.ActiveCfg = Release|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|ARM32.Build.0 = Release|Any CPU
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|x64.ActiveCfg = Release|x64
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|x64.Build.0 = Release|x64
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|x86.ActiveCfg = Release|x86
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}.Release|x86.Build.0 = Release|x86
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Debug|ARM32.ActiveCfg = Debug|Any CPU
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Debug|ARM32.Build.0 = Debug|Any CPU
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Debug|x64.Build.0 = Debug|x64
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Debug|x86.Build.0 = Debug|x86
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Release|ARM32.ActiveCfg = Release|Any CPU
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Release|ARM32.Build.0 = Release|Any CPU
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Release|x64.ActiveCfg = Release|x64
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Release|x64.Build.0 = Release|x64
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Release|x86.ActiveCfg = Release|x86
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B}.Release|x86.Build.0 = Release|x86
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Debug|Any CPU.Build.0 = Debug|x64
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Debug|ARM32.ActiveCfg = Debug|x64
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Debug|ARM32.Build.0 = Debug|x64
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Debug|x64.Build.0 = Debug|x64
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Debug|x86.Build.0 = Debug|x86
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Release|Any CPU.ActiveCfg = Release|x64
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Release|Any CPU.Build.0 = Release|x64
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Release|ARM32.ActiveCfg = Release|x64
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Release|ARM32.Build.0 = Release|x64
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Release|x64.ActiveCfg = Release|x64
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Release|x64.Build.0 = Release|x64
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Release|x86.ActiveCfg = Release|x86
|
||||
{6B096019-10F1-3287-4876-BD47D438875C}.Release|x86.Build.0 = Release|x86
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Debug|Any CPU.Build.0 = Debug|x64
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Debug|ARM32.ActiveCfg = Debug|x64
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Debug|ARM32.Build.0 = Debug|x64
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Debug|x64.Build.0 = Debug|x64
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Debug|x86.Build.0 = Debug|x86
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Release|Any CPU.ActiveCfg = Release|x64
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Release|Any CPU.Build.0 = Release|x64
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Release|ARM32.ActiveCfg = Release|x64
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Release|ARM32.Build.0 = Release|x64
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Release|x64.ActiveCfg = Release|x64
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Release|x64.Build.0 = Release|x64
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Release|x86.ActiveCfg = Release|x86
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{90A89707-927E-48D2-BFEB-84F95F531258} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
|
||||
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
|
||||
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
|
||||
{90A89707-927E-48D2-BFEB-84F95F531258} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
|
||||
{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
|
||||
{AD0B5BAE-5400-8A82-014B-09787DCF364B} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
|
||||
{6B096019-10F1-3287-4876-BD47D438875C} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
|
||||
{6D8340B2-77E8-4032-81AE-4C67753675A6} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {6B948258-B457-4B3D-955E-05ED3F03CF36}
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace Microsoft.WinRT
|
||||
{
|
||||
if (Environment.OSVersion.Version >= Win10Version)
|
||||
{
|
||||
return Windows.Foundation.Metadata.ApiInformation.IsTypePresent(typeName);
|
||||
return global::Windows.Foundation.Metadata.ApiInformation.IsTypePresent(typeName);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<OutputType>Library</OutputType>
|
||||
<AssemblyName>ZuneShell</AssemblyName>
|
||||
|
||||
<TargetFrameworks>net6.0;net6.0-windows10.0.22000;net461</TargetFrameworks>
|
||||
<TargetFrameworks>net6.0;net6.0-windows10.0.22000;net472</TargetFrameworks>
|
||||
<Platforms>x64;x86</Platforms>
|
||||
|
||||
<FileAlignment>512</FileAlignment>
|
||||
@@ -15,13 +15,11 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Resources\**\*.*" />
|
||||
|
||||
<PackageReference Include="Vanara.PInvoke.User32" Version="3.4.17" />
|
||||
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.11" />
|
||||
|
||||
<ProjectReference Include="..\libs\MicrosoftIris\UIXcontrols\UIXcontrols.csproj" />
|
||||
<ProjectReference Include="..\libs\MicrosoftIris\UIX\UIX.csproj" />
|
||||
|
||||
<ProjectReference Include="..\libs\ZuneUIXTools\libs\MicrosoftIris\UIXcontrols\UIXcontrols.csproj" />
|
||||
<ProjectReference Include="..\libs\ZuneUIXTools\libs\MicrosoftIris\UIX\UIX.csproj" />
|
||||
<!--
|
||||
Reference both the real and proxy ZuneDBApi, to make sure we have all the types.
|
||||
Use the version from ZuneImpl when available.
|
||||
@@ -47,4 +45,25 @@
|
||||
<ItemGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">
|
||||
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22621.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="Resources\RCDATA.resx">
|
||||
<Generator></Generator>
|
||||
<LogicalName>RCDATA.resources</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Update="Resources\RCDATA.DARK.resx">
|
||||
<Generator></Generator>
|
||||
<LogicalName>RCDATA.DARK.resources</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Update="Resources\RCDATA.CONTROLS.DARK.resx">
|
||||
<Generator></Generator>
|
||||
<LogicalName>RCDATA.CONTROLS.DARK.resources</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="lib\OpenZuneResources.dll">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
Submodule libs/MicrosoftIris deleted from fb24662492
Reference in New Issue
Block a user