diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-25 11:27:36 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-25 11:27:36 +0200 |
| commit | 53108c7036fe65232f39ee1d0dae0b9757ce99ff (patch) | |
| tree | 95518c4677fcd28da3ea3f536e5a0e1a9ce42faf /Software | |
| parent | 8b50d1c38d075e7ee9fb37199fc2baa70f51d811 (diff) | |
| download | Tango-53108c7036fe65232f39ee1d0dae0b9757ce99ff.tar.gz Tango-53108c7036fe65232f39ee1d0dae0b9757ce99ff.zip | |
Dropped support for browser module.
Diffstat (limited to 'Software')
6 files changed, 14 insertions, 67 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj index 7f36b7b17..fc00f83d4 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj @@ -189,10 +189,6 @@ <Project>{208C8BD8-72C6-4E3C-ACAA-351091A2ACC7}</Project> <Name>Tango.PPC.Shared</Name> </ProjectReference> - <ProjectReference Include="..\Tango.PPC.Browser\Tango.PPC.Browser.csproj"> - <Project>{f02eaa84-ad59-465b-99a2-4422c13bfb72}</Project> - <Name>Tango.PPC.Browser</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <Page Include="App.xaml"> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/CatalogViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/CatalogViewVM.cs index ecd2c7b93..dbc99fa87 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/CatalogViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/CatalogViewVM.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.Core.Commands; -using Tango.PPC.Browser; -using Tango.PPC.Browser.Navigation; -using Tango.PPC.Browser.Views; +//using Tango.PPC.Browser; +//using Tango.PPC.Browser.Navigation; +//using Tango.PPC.Browser.Views; using Tango.PPC.Common; namespace Tango.PPC.Technician.ViewModels @@ -51,11 +51,11 @@ namespace Tango.PPC.Technician.ViewModels /// </summary> private void OpenBrowserModule() { - NavigationManager.NavigateWithObject<BrowserModule, BrowserView, BrowserNavigationRequest>(new BrowserNavigationRequest() - { - Address = "https://twine-s.com/", - DisplayAddressBar = true, - }, true); + //NavigationManager.NavigateWithObject<BrowserModule, BrowserView, BrowserNavigationRequest>(new BrowserNavigationRequest() + //{ + // Address = "https://twine-s.com/", + // DisplayAddressBar = true, + //}, true); } } } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/CatalogView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/CatalogView.xaml index f954e461f..78fa17979 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/CatalogView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/CatalogView.xaml @@ -117,7 +117,7 @@ </StackPanel> </touch:TouchButton> - <touch:TouchButton Command="{Binding BrowserCommand}" Style="{StaticResource ButtonMenu}"> + <!--<touch:TouchButton Command="{Binding BrowserCommand}" Style="{StaticResource ButtonMenu}"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> <Image Source="../Images/browser.png" RenderOptions.BitmapScalingMode="Fant" Width="80" Height="80" /> <StackPanel Margin="10 0 0 0"> @@ -127,7 +127,7 @@ </TextBlock> </StackPanel> </StackPanel> - </touch:TouchButton> + </touch:TouchButton>--> </StackPanel> </Grid> </touch:LightTouchScrollViewer> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index 1257fee46..e738dbd43 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -584,11 +584,6 @@ <Project>{bc2753f8-c0f7-48f5-a85c-149ec7a2f8c7}</Project> <Name>Tango.PPC.BackupRestore</Name> </ProjectReference> - <ProjectReference Include="..\Modules\Tango.PPC.Browser\Tango.PPC.Browser.csproj"> - <Project>{f02eaa84-ad59-465b-99a2-4422c13bfb72}</Project> - <Name>Tango.PPC.Browser</Name> - <Private>True</Private> - </ProjectReference> <ProjectReference Include="..\Modules\Tango.PPC.BugReporting\Tango.PPC.BugReporting.csproj"> <Project>{8146fa0a-0725-4a1a-82e6-696c58f33a2b}</Project> <Name>Tango.PPC.BugReporting</Name> @@ -742,6 +737,8 @@ RD /S /Q "$(TargetDir)Packages\ProtoCompilers\" if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)x86\" if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)x64\" +if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)lib\" + copy /Y "$(SolutionDir)Referenced Assemblies\mscoree.dll" "$(TargetDir)" copy /Y "$(SolutionDir)Referenced Assemblies\msvcp140d.dll" "$(TargetDir)" copy /Y "$(SolutionDir)Referenced Assemblies\ucrtbased.dll" "$(TargetDir)" @@ -763,7 +760,7 @@ if $(ConfigurationName) == Debug copy /Y "$(TargetDir)Packages" "$(TargetDir)"</ </PropertyGroup> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> + <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> </requestedPrivileges> </security> </trustInfo> diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 3a18627c0..5793d289b 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -323,8 +323,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Packages.SamplePo EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.SchemaSynchronizer.CLI", "PPC\Tango.PPC.SchemaSynchronizer.CLI\Tango.PPC.SchemaSynchronizer.CLI.csproj", "{F3746F2B-E4AE-498B-9D42-74F95D992460}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Browser", "PPC\Modules\Tango.PPC.Browser\Tango.PPC.Browser.csproj", "{F02EAA84-AD59-465B-99A2-4422C13BFB72}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.MachineStudio.Sites", "MachineStudio\Modules\Tango.MachineStudio.Sites\Tango.MachineStudio.Sites.csproj", "{18A27902-9881-4556-8163-F6DF2236A14D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.MachineStudio.ActionLogs", "MachineStudio\Modules\Tango.MachineStudio.ActionLogs\Tango.MachineStudio.ActionLogs.csproj", "{447ECB9F-F730-47D6-8DF8-D232BF4A0315}" @@ -409,8 +407,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.FSE.Insights", "FSE\M EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.FSE.LogViewer.UI", "FSE\Tango.FSE.LogViewer.UI\Tango.FSE.LogViewer.UI.csproj", "{44908607-2E91-4713-821E-C35E25430BA0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Packages.CefInstaller", "PPC\UpdatePackages\Tango.PPC.Packages.CefInstaller\Tango.PPC.Packages.CefInstaller.csproj", "{DF64460A-6617-4338-872A-DC43FD994C48}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Packages.JobRunsStartTimePatch", "PPC\UpdatePackages\Tango.PPC.Packages.JobRunsStartTimePatch\Tango.PPC.Packages.JobRunsStartTimePatch.csproj", "{59643ABC-DF9A-497F-8A7C-4A131C7CF438}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.CctOptimizer.CLI", "Utilities\Tango.CctOptimizer.CLI\Tango.CctOptimizer.CLI.csproj", "{69168924-9AA8-447D-AD64-F07DBF4F0909}" @@ -3101,26 +3097,6 @@ Global {F3746F2B-E4AE-498B-9D42-74F95D992460}.Release|x64.Build.0 = Release|Any CPU {F3746F2B-E4AE-498B-9D42-74F95D992460}.Release|x86.ActiveCfg = Release|Any CPU {F3746F2B-E4AE-498B-9D42-74F95D992460}.Release|x86.Build.0 = Release|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Debug|ARM.Build.0 = Debug|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Debug|ARM64.Build.0 = Debug|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Debug|x64.ActiveCfg = Debug|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Debug|x64.Build.0 = Debug|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Debug|x86.ActiveCfg = Debug|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Debug|x86.Build.0 = Debug|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Release|Any CPU.Build.0 = Release|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Release|ARM.ActiveCfg = Release|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Release|ARM.Build.0 = Release|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Release|ARM64.ActiveCfg = Release|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Release|ARM64.Build.0 = Release|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Release|x64.ActiveCfg = Release|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Release|x64.Build.0 = Release|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Release|x86.ActiveCfg = Release|Any CPU - {F02EAA84-AD59-465B-99A2-4422C13BFB72}.Release|x86.Build.0 = Release|Any CPU {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|Any CPU.Build.0 = Debug|Any CPU {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -3870,26 +3846,6 @@ Global {44908607-2E91-4713-821E-C35E25430BA0}.Release|x64.Build.0 = Release|Any CPU {44908607-2E91-4713-821E-C35E25430BA0}.Release|x86.ActiveCfg = Release|Any CPU {44908607-2E91-4713-821E-C35E25430BA0}.Release|x86.Build.0 = Release|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Debug|ARM.ActiveCfg = Debug|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Debug|ARM.Build.0 = Debug|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Debug|ARM64.Build.0 = Debug|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Debug|x64.ActiveCfg = Debug|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Debug|x64.Build.0 = Debug|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Debug|x86.ActiveCfg = Debug|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Debug|x86.Build.0 = Debug|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Release|Any CPU.Build.0 = Release|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Release|ARM.ActiveCfg = Release|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Release|ARM.Build.0 = Release|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Release|ARM64.ActiveCfg = Release|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Release|ARM64.Build.0 = Release|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Release|x64.ActiveCfg = Release|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Release|x64.Build.0 = Release|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Release|x86.ActiveCfg = Release|Any CPU - {DF64460A-6617-4338-872A-DC43FD994C48}.Release|x86.Build.0 = Release|Any CPU {59643ABC-DF9A-497F-8A7C-4A131C7CF438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {59643ABC-DF9A-497F-8A7C-4A131C7CF438}.Debug|Any CPU.Build.0 = Debug|Any CPU {59643ABC-DF9A-497F-8A7C-4A131C7CF438}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -4296,7 +4252,6 @@ Global {2CD12594-3522-4658-A65F-190EE58B6AFA} = {E728CBD9-1AF4-4814-A218-E4BD26E7EDEA} {DA391B02-AE28-4EA1-A80F-D0F4C8029FFA} = {E728CBD9-1AF4-4814-A218-E4BD26E7EDEA} {F3746F2B-E4AE-498B-9D42-74F95D992460} = {C81ED1A3-D18C-4D80-A8F5-061994A14A60} - {F02EAA84-AD59-465B-99A2-4422C13BFB72} = {0048447D-1D94-4E60-9DAD-7349C777CB4E} {18A27902-9881-4556-8163-F6DF2236A14D} = {B2AF4F3F-2828-47C3-8F3E-A0EA0BD66FF8} {447ECB9F-F730-47D6-8DF8-D232BF4A0315} = {B2AF4F3F-2828-47C3-8F3E-A0EA0BD66FF8} {511A8AD7-6BA2-4BB5-A20A-1454196C5503} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760} @@ -4329,7 +4284,6 @@ Global {12EC97A5-C3C2-40CB-B658-EC4018B89269} = {4EE6DBA1-71BC-49E2-8DC7-266487E61050} {AC5B4BE7-D607-4A38-98F8-B87ACA468313} = {4EE6DBA1-71BC-49E2-8DC7-266487E61050} {44908607-2E91-4713-821E-C35E25430BA0} = {004337EB-0761-4D30-B9F5-AE6E1CFC6013} - {DF64460A-6617-4338-872A-DC43FD994C48} = {E728CBD9-1AF4-4814-A218-E4BD26E7EDEA} {59643ABC-DF9A-497F-8A7C-4A131C7CF438} = {E728CBD9-1AF4-4814-A218-E4BD26E7EDEA} {69168924-9AA8-447D-AD64-F07DBF4F0909} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760} {EA4233F1-4B7B-4CCF-A6DE-2D17612EBA90} = {E728CBD9-1AF4-4814-A218-E4BD26E7EDEA} |
