From 3a666655b6d675222b6f037c4b5943a7005d0bc4 Mon Sep 17 00:00:00 2001 From: Yoshi Askharoun Date: Wed, 3 Nov 2021 13:15:49 -0500 Subject: [PATCH] Changed UIX reference --- VSIX/UIXBuildTask/UIXBuildTask.csproj | 6 ---- ZuneUIXTools.sln | 42 ++++++++++++++++++++------- ZuneUIXTools/ZuneUIXTools.csproj | 5 +--- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/VSIX/UIXBuildTask/UIXBuildTask.csproj b/VSIX/UIXBuildTask/UIXBuildTask.csproj index 680d332..3976dc9 100644 --- a/VSIX/UIXBuildTask/UIXBuildTask.csproj +++ b/VSIX/UIXBuildTask/UIXBuildTask.csproj @@ -50,11 +50,5 @@ - - - {5681a1bd-b3ec-450b-bf6e-38187204b6be} - UIX - - \ No newline at end of file diff --git a/ZuneUIXTools.sln b/ZuneUIXTools.sln index c91537a..946aa5f 100644 --- a/ZuneUIXTools.sln +++ b/ZuneUIXTools.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30907.101 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZuneUIXTools", "ZuneUIXTools\ZuneUIXTools.csproj", "{3F8F7428-4FC3-41B8-BE59-E6F25C11019A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIX", "..\ZuneShell\UIX\UIX.csproj", "{5681A1BD-B3EC-450B-BF6E-38187204B6BE}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VSIX", "VSIX", "{0CB0EB34-BA9C-4D36-AE45-380F3F0D12ED}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IrisVSIX", "VSIX\IrisVSIX\IrisVSIX.csproj", "{B4EEF46A-3235-42BD-9540-7AAA03BAC77D}" @@ -17,62 +15,86 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIXBuildTask", "VSIX\UIXBui EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZuneUIXTools.ViewModels", "ZuneUIXTools.ViewModels\ZuneUIXTools.ViewModels.csproj", "{707AA11C-6D10-4CF2-9852-73FC3D33EF02}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIX", "..\..\ZuneDev\ZuneShell.dll\UIX\UIX.csproj", "{5681A1BD-B3EC-450B-BF6E-38187204B6BE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3F8F7428-4FC3-41B8-BE59-E6F25C11019A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3F8F7428-4FC3-41B8-BE59-E6F25C11019A}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F8F7428-4FC3-41B8-BE59-E6F25C11019A}.Debug|x64.ActiveCfg = Debug|Any CPU {3F8F7428-4FC3-41B8-BE59-E6F25C11019A}.Debug|x64.Build.0 = Debug|Any CPU + {3F8F7428-4FC3-41B8-BE59-E6F25C11019A}.Debug|x86.ActiveCfg = Debug|Any CPU + {3F8F7428-4FC3-41B8-BE59-E6F25C11019A}.Debug|x86.Build.0 = Debug|Any CPU {3F8F7428-4FC3-41B8-BE59-E6F25C11019A}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F8F7428-4FC3-41B8-BE59-E6F25C11019A}.Release|Any CPU.Build.0 = Release|Any CPU {3F8F7428-4FC3-41B8-BE59-E6F25C11019A}.Release|x64.ActiveCfg = Release|Any CPU {3F8F7428-4FC3-41B8-BE59-E6F25C11019A}.Release|x64.Build.0 = Release|Any CPU - {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Debug|x64.ActiveCfg = Debug|Any CPU - {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Debug|x64.Build.0 = Debug|Any CPU - {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Release|Any CPU.Build.0 = Release|Any CPU - {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Release|x64.ActiveCfg = Release|Any CPU - {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Release|x64.Build.0 = Release|Any CPU + {3F8F7428-4FC3-41B8-BE59-E6F25C11019A}.Release|x86.ActiveCfg = Release|Any CPU + {3F8F7428-4FC3-41B8-BE59-E6F25C11019A}.Release|x86.Build.0 = Release|Any CPU {B4EEF46A-3235-42BD-9540-7AAA03BAC77D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B4EEF46A-3235-42BD-9540-7AAA03BAC77D}.Debug|Any CPU.Build.0 = Debug|Any CPU {B4EEF46A-3235-42BD-9540-7AAA03BAC77D}.Debug|x64.ActiveCfg = Debug|Any CPU {B4EEF46A-3235-42BD-9540-7AAA03BAC77D}.Debug|x64.Build.0 = Debug|Any CPU + {B4EEF46A-3235-42BD-9540-7AAA03BAC77D}.Debug|x86.ActiveCfg = Debug|Any CPU {B4EEF46A-3235-42BD-9540-7AAA03BAC77D}.Release|Any CPU.ActiveCfg = Release|Any CPU {B4EEF46A-3235-42BD-9540-7AAA03BAC77D}.Release|Any CPU.Build.0 = Release|Any CPU {B4EEF46A-3235-42BD-9540-7AAA03BAC77D}.Release|x64.ActiveCfg = Release|Any CPU {B4EEF46A-3235-42BD-9540-7AAA03BAC77D}.Release|x64.Build.0 = Release|Any CPU + {B4EEF46A-3235-42BD-9540-7AAA03BAC77D}.Release|x86.ActiveCfg = Release|Any CPU {854495B4-B684-47AC-9771-A644BF47B2FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {854495B4-B684-47AC-9771-A644BF47B2FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {854495B4-B684-47AC-9771-A644BF47B2FF}.Debug|x64.ActiveCfg = Debug|Any CPU {854495B4-B684-47AC-9771-A644BF47B2FF}.Debug|x64.Build.0 = Debug|Any CPU + {854495B4-B684-47AC-9771-A644BF47B2FF}.Debug|x86.ActiveCfg = Debug|Any CPU + {854495B4-B684-47AC-9771-A644BF47B2FF}.Debug|x86.Build.0 = Debug|Any CPU {854495B4-B684-47AC-9771-A644BF47B2FF}.Release|Any CPU.ActiveCfg = Release|Any CPU {854495B4-B684-47AC-9771-A644BF47B2FF}.Release|Any CPU.Build.0 = Release|Any CPU {854495B4-B684-47AC-9771-A644BF47B2FF}.Release|x64.ActiveCfg = Release|x64 {854495B4-B684-47AC-9771-A644BF47B2FF}.Release|x64.Build.0 = Release|x64 + {854495B4-B684-47AC-9771-A644BF47B2FF}.Release|x86.ActiveCfg = Release|Any CPU + {854495B4-B684-47AC-9771-A644BF47B2FF}.Release|x86.Build.0 = Release|Any CPU {1FF973F0-C293-439C-83F8-D2C02B624C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1FF973F0-C293-439C-83F8-D2C02B624C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU {1FF973F0-C293-439C-83F8-D2C02B624C2D}.Debug|x64.ActiveCfg = Debug|Any CPU {1FF973F0-C293-439C-83F8-D2C02B624C2D}.Debug|x64.Build.0 = Debug|Any CPU + {1FF973F0-C293-439C-83F8-D2C02B624C2D}.Debug|x86.ActiveCfg = Debug|Any CPU + {1FF973F0-C293-439C-83F8-D2C02B624C2D}.Debug|x86.Build.0 = Debug|Any CPU {1FF973F0-C293-439C-83F8-D2C02B624C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU {1FF973F0-C293-439C-83F8-D2C02B624C2D}.Release|Any CPU.Build.0 = Release|Any CPU {1FF973F0-C293-439C-83F8-D2C02B624C2D}.Release|x64.ActiveCfg = Release|Any CPU {1FF973F0-C293-439C-83F8-D2C02B624C2D}.Release|x64.Build.0 = Release|Any CPU + {1FF973F0-C293-439C-83F8-D2C02B624C2D}.Release|x86.ActiveCfg = Release|Any CPU + {1FF973F0-C293-439C-83F8-D2C02B624C2D}.Release|x86.Build.0 = Release|Any CPU {707AA11C-6D10-4CF2-9852-73FC3D33EF02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {707AA11C-6D10-4CF2-9852-73FC3D33EF02}.Debug|Any CPU.Build.0 = Debug|Any CPU {707AA11C-6D10-4CF2-9852-73FC3D33EF02}.Debug|x64.ActiveCfg = Debug|Any CPU {707AA11C-6D10-4CF2-9852-73FC3D33EF02}.Debug|x64.Build.0 = Debug|Any CPU + {707AA11C-6D10-4CF2-9852-73FC3D33EF02}.Debug|x86.ActiveCfg = Debug|Any CPU + {707AA11C-6D10-4CF2-9852-73FC3D33EF02}.Debug|x86.Build.0 = Debug|Any CPU {707AA11C-6D10-4CF2-9852-73FC3D33EF02}.Release|Any CPU.ActiveCfg = Release|Any CPU {707AA11C-6D10-4CF2-9852-73FC3D33EF02}.Release|Any CPU.Build.0 = Release|Any CPU {707AA11C-6D10-4CF2-9852-73FC3D33EF02}.Release|x64.ActiveCfg = Release|Any CPU {707AA11C-6D10-4CF2-9852-73FC3D33EF02}.Release|x64.Build.0 = Release|Any CPU + {707AA11C-6D10-4CF2-9852-73FC3D33EF02}.Release|x86.ActiveCfg = Release|Any CPU + {707AA11C-6D10-4CF2-9852-73FC3D33EF02}.Release|x86.Build.0 = Release|Any CPU + {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Debug|Any CPU.ActiveCfg = Debug|x86 + {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Debug|x64.ActiveCfg = Debug|x64 + {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Debug|x64.Build.0 = Debug|x64 + {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Debug|x86.ActiveCfg = Debug|x86 + {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Debug|x86.Build.0 = Debug|x86 + {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Release|Any CPU.ActiveCfg = Release|x86 + {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Release|x64.ActiveCfg = Release|x64 + {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Release|x64.Build.0 = Release|x64 + {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Release|x86.ActiveCfg = Release|x86 + {5681A1BD-B3EC-450B-BF6E-38187204B6BE}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ZuneUIXTools/ZuneUIXTools.csproj b/ZuneUIXTools/ZuneUIXTools.csproj index bfd9f49..bf781d3 100644 --- a/ZuneUIXTools/ZuneUIXTools.csproj +++ b/ZuneUIXTools/ZuneUIXTools.csproj @@ -30,10 +30,7 @@ - - - - +