Merge pull request 'Development' (#8) from Development into master
Merging .NET 4.6.2 from Dev to master.
This commit is contained in:
commit
185263dc22
@ -27,7 +27,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
@ -32,9 +32,9 @@ namespace AdjustBuildRevision
|
|||||||
{
|
{
|
||||||
// Allow for setting build revision on either proms or the roeditor:
|
// Allow for setting build revision on either proms or the roeditor:
|
||||||
if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
|
if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
|
||||||
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")");
|
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
|
||||||
else
|
else
|
||||||
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.0.yyMM.dHH") + "\")");
|
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")");
|
||||||
// if (outline != line)
|
// if (outline != line)
|
||||||
// {
|
// {
|
||||||
// Console.WriteLine("Before: '{0}'", line);
|
// Console.WriteLine("Before: '{0}'", line);
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<configSections>
|
<configSections>
|
||||||
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
@ -6,7 +6,7 @@
|
|||||||
</sectionGroup>
|
</sectionGroup>
|
||||||
</configSections>
|
</configSections>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
|
||||||
</startup>
|
</startup>
|
||||||
<userSettings>
|
<userSettings>
|
||||||
<Baseline.Properties.Settings>
|
<Baseline.Properties.Settings>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>Baseline</RootNamespace>
|
<RootNamespace>Baseline</RootNamespace>
|
||||||
<AssemblyName>Baseline</AssemblyName>
|
<AssemblyName>Baseline</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<SccProjectName>
|
<SccProjectName>
|
||||||
</SccProjectName>
|
</SccProjectName>
|
||||||
@ -19,6 +19,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
@ -80,6 +81,7 @@
|
|||||||
<Compile Include="Properties\Resources.Designer.cs">
|
<Compile Include="Properties\Resources.Designer.cs">
|
||||||
<AutoGen>True</AutoGen>
|
<AutoGen>True</AutoGen>
|
||||||
<DependentUpon>Resources.resx</DependentUpon>
|
<DependentUpon>Resources.resx</DependentUpon>
|
||||||
|
<DesignTime>True</DesignTime>
|
||||||
</Compile>
|
</Compile>
|
||||||
<None Include="Properties\DataSources\IgnoreLines.datasource" />
|
<None Include="Properties\DataSources\IgnoreLines.datasource" />
|
||||||
<None Include="Properties\Settings.settings">
|
<None Include="Properties\Settings.settings">
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>FlexableMessageBox</RootNamespace>
|
<RootNamespace>FlexableMessageBox</RootNamespace>
|
||||||
<AssemblyName>FlexableMessageBox</AssemblyName>
|
<AssemblyName>FlexableMessageBox</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
<SccProjectName>
|
<SccProjectName>
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
2
PROMS/Formats/Properties/Resources.Designer.cs
generated
2
PROMS/Formats/Properties/Resources.Designer.cs
generated
@ -19,7 +19,7 @@ namespace Formats.Properties {
|
|||||||
// class via a tool like ResGen or Visual Studio.
|
// class via a tool like ResGen or Visual Studio.
|
||||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||||
// with the /str option, or rebuild your VS project.
|
// with the /str option, or rebuild your VS project.
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
internal class Resources {
|
internal class Resources {
|
||||||
|
2
PROMS/Formats/Properties/Settings.Designer.cs
generated
2
PROMS/Formats/Properties/Settings.Designer.cs
generated
@ -12,7 +12,7 @@ namespace Formats.Properties {
|
|||||||
|
|
||||||
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
|
||||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||||
|
|
||||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup><runtime>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
|
||||||
</assemblyBinding></runtime></configuration>
|
</assemblyBinding></runtime></configuration>
|
||||||
|
@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
|
|||||||
// Build YYMM (two digit year, two digit month)
|
// Build YYMM (two digit year, two digit month)
|
||||||
// Revision DHH (day - no leading zero, two digit hour - military time
|
// Revision DHH (day - no leading zero, two digit hour - military time
|
||||||
//
|
//
|
||||||
[assembly: AssemblyVersion("2.1.2210.2615")]
|
[assembly: AssemblyVersion("2.2.2306.2212")]
|
||||||
[assembly: AssemblyFileVersion("2.1.2210.2615")]
|
[assembly: AssemblyFileVersion("2.2.2306.2212")]
|
||||||
|
|
||||||
//
|
//
|
||||||
// In order to sign your assembly you must specify a key to use. Refer to the
|
// In order to sign your assembly you must specify a key to use. Refer to the
|
||||||
@ -85,6 +85,9 @@ using System.Runtime.CompilerServices;
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ namespace ROEditor.Properties {
|
|||||||
// class via a tool like ResGen or Visual Studio.
|
// class via a tool like ResGen or Visual Studio.
|
||||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||||
// with the /str option, or rebuild your VS project.
|
// with the /str option, or rebuild your VS project.
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
internal class Resources {
|
internal class Resources {
|
||||||
|
@ -44,12 +44,12 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
<OutputPath>..\..\..\..\VEPROMS User Interface\bin\Debug\</OutputPath>
|
||||||
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
|
||||||
<BaseAddress>285212672</BaseAddress>
|
<BaseAddress>285212672</BaseAddress>
|
||||||
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
|
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
|
||||||
@ -71,6 +71,7 @@
|
|||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<Prefer32Bit>false</Prefer32Bit>
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
<OutputPath>bin\Release\</OutputPath>
|
||||||
@ -122,6 +123,10 @@
|
|||||||
<Reference Include="System.Xml">
|
<Reference Include="System.Xml">
|
||||||
<Name>System.XML</Name>
|
<Name>System.XML</Name>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="Volian.Base.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\..\..\..\Volian.Base.Library\bin\Debug\Volian.Base.Library.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="AboutROEditor.cs">
|
<Compile Include="AboutROEditor.cs">
|
||||||
@ -208,10 +213,6 @@
|
|||||||
<None Include="FixRev.Bat" />
|
<None Include="FixRev.Bat" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\..\..\..\Volian.Base.Library\Volian.Base.Library.csproj">
|
|
||||||
<Project>{AEEE9FD1-6892-45E2-A67E-418C06D46FF9}</Project>
|
|
||||||
<Name>Volian.Base.Library</Name>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\..\LibSource\ctlXMLEditLib\ctlXMLEditLib.csproj">
|
<ProjectReference Include="..\..\..\LibSource\ctlXMLEditLib\ctlXMLEditLib.csproj">
|
||||||
<Project>{DECA8343-6351-11D6-8487-00A0CC271352}</Project>
|
<Project>{DECA8343-6351-11D6-8487-00A0CC271352}</Project>
|
||||||
<Name>ctlXMLEditLib</Name>
|
<Name>ctlXMLEditLib</Name>
|
||||||
|
@ -56,8 +56,8 @@ Global
|
|||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86
|
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
|
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -70,8 +70,8 @@ Global
|
|||||||
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Release|x86.Build.0 = Release|x86
|
{3A4A3543-2D44-11D6-8452-00A0CC271352}.Release|x86.Build.0 = Release|x86
|
||||||
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|x86.ActiveCfg = Debug|x86
|
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|x86.Build.0 = Debug|x86
|
{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -83,8 +83,8 @@ Global
|
|||||||
{551CB7B3-00B1-11D7-8590-482B59000000}.Release|x86.Build.0 = Release|x86
|
{551CB7B3-00B1-11D7-8590-482B59000000}.Release|x86.Build.0 = Release|x86
|
||||||
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86
|
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
|
{0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -96,8 +96,8 @@ Global
|
|||||||
{0C782592-AA05-11D6-84D1-00A0CC271352}.Release|x86.Build.0 = Release|x86
|
{0C782592-AA05-11D6-84D1-00A0CC271352}.Release|x86.Build.0 = Release|x86
|
||||||
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86
|
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
|
{6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -109,8 +109,8 @@ Global
|
|||||||
{6D44F537-879E-11D6-84B8-00A0CC271352}.Release|x86.Build.0 = Release|x86
|
{6D44F537-879E-11D6-84B8-00A0CC271352}.Release|x86.Build.0 = Release|x86
|
||||||
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86
|
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
|
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -122,8 +122,8 @@ Global
|
|||||||
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Release|x86.Build.0 = Release|x86
|
{0C7825FD-AA05-11D6-84D1-00A0CC271352}.Release|x86.Build.0 = Release|x86
|
||||||
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86
|
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
|
{DECA8343-6351-11D6-8487-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -135,8 +135,8 @@ Global
|
|||||||
{DECA8343-6351-11D6-8487-00A0CC271352}.Release|x86.Build.0 = Release|x86
|
{DECA8343-6351-11D6-8487-00A0CC271352}.Release|x86.Build.0 = Release|x86
|
||||||
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|x86.ActiveCfg = Debug|x86
|
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|x86.Build.0 = Debug|x86
|
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -148,8 +148,8 @@ Global
|
|||||||
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Release|x86.Build.0 = Release|x86
|
{38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Release|x86.Build.0 = Release|x86
|
||||||
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|x86.ActiveCfg = Debug|x86
|
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|x86.Build.0 = Debug|x86
|
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -162,8 +162,8 @@ Global
|
|||||||
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Release|x86.Build.0 = Release|x86
|
{134D8938-9CDC-4712-9444-D5DCC6638AB6}.Release|x86.Build.0 = Release|x86
|
||||||
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|x86.ActiveCfg = Debug|x86
|
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|x86.Build.0 = Debug|x86
|
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -176,8 +176,8 @@ Global
|
|||||||
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Release|x86.Build.0 = Release|x86
|
{A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Release|x86.Build.0 = Release|x86
|
||||||
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|x86.ActiveCfg = Debug|x86
|
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|x86.Build.0 = Debug|x86
|
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -190,8 +190,8 @@ Global
|
|||||||
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Release|x86.Build.0 = Release|x86
|
{680054D3-49C4-40E7-92A5-67B97DCE6308}.Release|x86.Build.0 = Release|x86
|
||||||
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86
|
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
|
{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup><runtime>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
|
||||||
</assemblyBinding></runtime>
|
</assemblyBinding></runtime>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -60,6 +60,6 @@
|
|||||||
</logger>
|
</logger>
|
||||||
</log4net>
|
</log4net>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
|
||||||
</startup>
|
</startup>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -19,7 +19,7 @@ namespace RoAccessToSql.Properties {
|
|||||||
// class via a tool like ResGen or Visual Studio.
|
// class via a tool like ResGen or Visual Studio.
|
||||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||||
// with the /str option, or rebuild your VS project.
|
// with the /str option, or rebuild your VS project.
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
internal class Resources {
|
internal class Resources {
|
||||||
|
@ -12,7 +12,7 @@ namespace RoAccessToSql.Properties {
|
|||||||
|
|
||||||
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
|
||||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||||
|
|
||||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>RoAccessToSql</RootNamespace>
|
<RootNamespace>RoAccessToSql</RootNamespace>
|
||||||
<AssemblyName>RoAccessToSql</AssemblyName>
|
<AssemblyName>RoAccessToSql</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
<SccProjectName>
|
<SccProjectName>
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -179,4 +179,4 @@
|
|||||||
</setting>
|
</setting>
|
||||||
</UISampleNetBar1.Properties.Settings>
|
</UISampleNetBar1.Properties.Settings>
|
||||||
</userSettings>
|
</userSettings>
|
||||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
|
||||||
|
@ -44,8 +44,12 @@ using System.Runtime.InteropServices;
|
|||||||
// Revision DHH (day - no leading zero, two digit hour - military time
|
// Revision DHH (day - no leading zero, two digit hour - military time
|
||||||
//
|
//
|
||||||
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
|
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
|
||||||
[assembly: AssemblyVersion("2.0.2306.2117")]
|
[assembly: AssemblyVersion("2.1.2306.2214")]
|
||||||
[assembly: AssemblyFileVersion("2.0.2306.2117")]
|
[assembly: AssemblyFileVersion("2.1.2306.2214")]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ namespace VEPROMS.Properties {
|
|||||||
// class via a tool like ResGen or Visual Studio.
|
// class via a tool like ResGen or Visual Studio.
|
||||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||||
// with the /str option, or rebuild your VS project.
|
// with the /str option, or rebuild your VS project.
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
internal class Resources {
|
internal class Resources {
|
||||||
|
@ -12,7 +12,7 @@ namespace VEPROMS.Properties {
|
|||||||
|
|
||||||
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
|
||||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||||
|
|
||||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
@ -99,9 +99,6 @@
|
|||||||
<Prefer32Bit>false</Prefer32Bit>
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="AxInterop.DSOFramer">
|
|
||||||
<HintPath>..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\DSOFramer\AxInterop.DSOFramer.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
|
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
</Reference>
|
</Reference>
|
||||||
@ -115,21 +112,15 @@
|
|||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll</HintPath>
|
<HintPath>..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Interop.DSOFramer">
|
|
||||||
<HintPath>..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\DSOFramer\Interop.DSOFramer.dll</HintPath>
|
|
||||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
|
<Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\..\..\..\3rdPartyLibraries\Ionic\Ionic.Zip.dll</HintPath>
|
<HintPath>..\..\..\..\3rdPartyLibraries\Ionic\Ionic.Zip.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Itenso.Rtf.Interpreter, Version=1.1.0.0, Culture=neutral, processorArchitecture=x86">
|
<Reference Include="Itenso.Rtf.Interpreter">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<HintPath>..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll</HintPath>
|
||||||
<HintPath>..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll</HintPath>
|
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Itenso.Rtf.Parser, Version=1.1.0.0, Culture=neutral, processorArchitecture=x86">
|
<Reference Include="Itenso.Rtf.Parser">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<HintPath>..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll</HintPath>
|
||||||
<HintPath>..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll</HintPath>
|
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
|
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
@ -494,6 +494,7 @@
|
|||||||
this.swRefreshTblsForSrch.TabIndex = 32;
|
this.swRefreshTblsForSrch.TabIndex = 32;
|
||||||
this.swRefreshTblsForSrch.Value = true;
|
this.swRefreshTblsForSrch.Value = true;
|
||||||
this.swRefreshTblsForSrch.ValueObject = "Y";
|
this.swRefreshTblsForSrch.ValueObject = "Y";
|
||||||
|
this.swRefreshTblsForSrch.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
|
||||||
//
|
//
|
||||||
// lblRefreshTblForSrch
|
// lblRefreshTblForSrch
|
||||||
//
|
//
|
||||||
|
@ -296,47 +296,70 @@ namespace VEPROMS
|
|||||||
}
|
}
|
||||||
this.Cursor = Cursors.Default;
|
this.Cursor = Cursors.Default;
|
||||||
}
|
}
|
||||||
|
|
||||||
//C2022-028 check for Bad RO Links - we will check all of the RO links found in procedure step text
|
//C2022-028 check for Bad RO Links - we will check all of the RO links found in procedure step text
|
||||||
|
//B2022-144 Allow to check individual procedures for bad RO links
|
||||||
private void CheckROLinks()
|
private void CheckROLinks()
|
||||||
{
|
{
|
||||||
bool badLinksFound = false;
|
bool badLinksFound = false;
|
||||||
this.Cursor = Cursors.WaitCursor;
|
this.Cursor = Cursors.WaitCursor;
|
||||||
List<DocVersionInfo> dvil = new List<DocVersionInfo>();
|
List<ProcedureInfo> pil = new List<ProcedureInfo>();
|
||||||
foreach (TreeNode tn in myDocVersions.Keys)
|
// populate a list of procedures that the user selected to process
|
||||||
|
foreach (TreeNode tn in myProcedures.Keys)
|
||||||
if (tn.Checked)
|
if (tn.Checked)
|
||||||
dvil.Add(myDocVersions[tn]);
|
pil.Add(myProcedures[tn]);
|
||||||
DateTime pStart = DateTime.Now;
|
DateTime pStart = DateTime.Now;
|
||||||
txtProcess.AppendText("Check RO Links");
|
txtProcess.AppendText("Check RO Links");
|
||||||
txtProcess.AppendText(Environment.NewLine);
|
txtProcess.AppendText(Environment.NewLine);
|
||||||
txtProcess.AppendText(pStart.ToString("MM/dd/yyyy @ HH:mm"));
|
txtProcess.AppendText(pStart.ToString("MM/dd/yyyy @ HH:mm"));
|
||||||
txtProcess.AppendText(Environment.NewLine);
|
txtProcess.AppendText(Environment.NewLine);
|
||||||
|
txtResults.Clear();
|
||||||
Application.DoEvents();
|
Application.DoEvents();
|
||||||
pbProcess.Minimum = 0;
|
pbProcess.Minimum = 0;
|
||||||
pbProcess.Maximum = dvil.Count;
|
pbProcess.Maximum = pil.Count;
|
||||||
pbProcess.Step = 1;
|
pbProcess.Step = 1;
|
||||||
while (dvil.Count > 0)
|
int i = 0;
|
||||||
|
while (pil.Count > 0)
|
||||||
{
|
{
|
||||||
StringBuilder sbDocVersions = new StringBuilder();
|
StringBuilder sbProcs = new StringBuilder();
|
||||||
Queue<DocVersionInfo> dviq = new Queue<DocVersionInfo>();
|
// Put the list of procedures in a queue
|
||||||
foreach (DocVersionInfo dvi in dvil)
|
Queue<ProcedureInfo> piq = new Queue<ProcedureInfo>();
|
||||||
dviq.Enqueue(dvi);
|
foreach (ProcedureInfo pi in pil)
|
||||||
dvil.Clear();
|
piq.Enqueue(pi);
|
||||||
// if we are processing more than one procedure set, use MessageList to hold the summary results for each set
|
pil.Clear();
|
||||||
if (dviq.Count > 1)
|
string prevStatMsgSet = string.Empty;
|
||||||
ROFstInfo.MessageList = new StringBuilder();
|
string statmsgproc = string.Empty;
|
||||||
while (dviq.Count > 0)
|
while (piq.Count > 0)
|
||||||
{
|
{
|
||||||
string msg = string.Empty;
|
string msg = string.Empty;
|
||||||
DocVersionInfo dq = dviq.Dequeue();
|
ProcedureInfo pq = piq.Dequeue(); // get next procedure from queue
|
||||||
if (!MySessionInfo.CanCheckOutItem(dq.VersionID, CheckOutType.DocVersion, ref msg))
|
if (!MySessionInfo.CanCheckOutItem(pq.ItemID, CheckOutType.Procedure, ref msg))
|
||||||
{
|
{
|
||||||
dvil.Add(dq);
|
pil.Add(pq); // cannot open this procedure to process - save to a list of un-processed procedures
|
||||||
sbDocVersions.AppendLine(msg);
|
sbProcs.AppendLine(msg);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
string statmsgset = string.Format("Check ROs Links in Procedure Set \"{0}\"", pq.MyDocVersion.MyFolder.Name);
|
||||||
|
if (statmsgset != prevStatMsgSet)
|
||||||
|
{
|
||||||
|
txtResults.AppendText(statmsgset);
|
||||||
|
txtResults.AppendText(Environment.NewLine);
|
||||||
|
txtResults.AppendText(Environment.NewLine);
|
||||||
|
prevStatMsgSet = statmsgset;
|
||||||
|
}
|
||||||
|
ProcedureInfo.ResetCheckROLinkCounters();
|
||||||
|
DoProgressBarRefresh(++i, piq.Count, string.Format("{0} ({1}/{2} ROs)", pq.DisplayNumber, i, piq.Count));
|
||||||
ContentInfo.StaticContentInfoChange += new StaticContentInfoEvent(ContentInfo_StaticContentInfoChange);
|
ContentInfo.StaticContentInfoChange += new StaticContentInfoEvent(ContentInfo_StaticContentInfoChange);
|
||||||
badLinksFound |= ProcessCheckROLinks(dq);
|
statmsgproc = string.Format(" Checking Procedure {0}", pq.DisplayNumber);
|
||||||
|
txtResults.AppendText(statmsgproc);
|
||||||
|
txtResults.AppendText(Environment.NewLine);
|
||||||
|
int numBadROLinks = ROFstInfo.CheckROLinksInThisProcedure(pq, txtProcess); // check the procedure for bad RO links
|
||||||
|
badLinksFound |= (numBadROLinks > 0);
|
||||||
|
string smsg = (numBadROLinks > 0) ? string.Format(" {0} Bad RO Link(s) Found", numBadROLinks) : " No Bad RO Links Found";
|
||||||
|
txtResults.AppendText(smsg);
|
||||||
|
txtResults.AppendText(Environment.NewLine);
|
||||||
|
txtResults.AppendText(Environment.NewLine);
|
||||||
ContentInfo.StaticContentInfoChange -= new StaticContentInfoEvent(ContentInfo_StaticContentInfoChange);
|
ContentInfo.StaticContentInfoChange -= new StaticContentInfoEvent(ContentInfo_StaticContentInfoChange);
|
||||||
pbProcess.PerformStep();
|
pbProcess.PerformStep();
|
||||||
Application.DoEvents();
|
Application.DoEvents();
|
||||||
@ -352,7 +375,7 @@ namespace VEPROMS
|
|||||||
FlexibleMessageBox.Show("No Bad RO links were detected.", "Check RO Links Complete");
|
FlexibleMessageBox.Show("No Bad RO links were detected.", "Check RO Links Complete");
|
||||||
ROFstInfo.MessageList = null;
|
ROFstInfo.MessageList = null;
|
||||||
|
|
||||||
if (dvil.Count > 0)
|
if (piq.Count > 0)
|
||||||
{
|
{
|
||||||
frmBatchRefreshCheckedOut frmCO = new frmBatchRefreshCheckedOut(0);
|
frmBatchRefreshCheckedOut frmCO = new frmBatchRefreshCheckedOut(0);
|
||||||
frmCO.MySessionInfo = MySessionInfo;
|
frmCO.MySessionInfo = MySessionInfo;
|
||||||
@ -364,89 +387,7 @@ namespace VEPROMS
|
|||||||
}
|
}
|
||||||
this.Cursor = Cursors.Default;
|
this.Cursor = Cursors.Default;
|
||||||
}
|
}
|
||||||
private bool ProcessCheckROLinks(DocVersionInfo dq)
|
|
||||||
{
|
|
||||||
bool badLinksFound = false;
|
|
||||||
string statmsg = string.Format("Checking ROs for {0}", dq.MyFolder.Name);
|
|
||||||
InitialProgressBarMessage = statmsg;
|
|
||||||
txtProcess.AppendText(statmsg);
|
|
||||||
txtProcess.AppendText(Environment.NewLine);
|
|
||||||
txtResults.AppendText(statmsg);
|
|
||||||
txtResults.AppendText(Environment.NewLine);
|
|
||||||
Application.DoEvents();
|
|
||||||
|
|
||||||
//if (dq.DocVersionAssociationCount < 1)
|
|
||||||
//{
|
|
||||||
// ProgressBar.ColorTable = eProgressBarItemColor.Error;
|
|
||||||
// FinalProgressBarMessage = "No ROs associated";
|
|
||||||
// txtProcess.AppendText(Environment.NewLine);
|
|
||||||
// txtProcess.AppendText(Environment.NewLine);
|
|
||||||
// txtProcess.AppendText("Error Updating ro.fst. No associated ro.fst");
|
|
||||||
// txtProcess.AppendText(Environment.NewLine);
|
|
||||||
// txtProcess.AppendText(Environment.NewLine);
|
|
||||||
// txtResults.AppendText("Error Updating ro.fst. No associated ro.fst");
|
|
||||||
// txtResults.AppendText(Environment.NewLine);
|
|
||||||
// txtResults.AppendText(Environment.NewLine);
|
|
||||||
// return;
|
|
||||||
//}
|
|
||||||
|
|
||||||
//ROFstInfo roFstInfo = dq.DocVersionAssociations[0].MyROFst;
|
|
||||||
//string rofstPath = roFstInfo.MyRODb.FolderPath + @"\ro.fst";
|
|
||||||
|
|
||||||
////if (!pathExists(rofstPath))
|
|
||||||
//if (!File.Exists(rofstPath))
|
|
||||||
//{
|
|
||||||
// ProgressBar.ColorTable = eProgressBarItemColor.Error;
|
|
||||||
// FinalProgressBarMessage = "No existing RO.FST";
|
|
||||||
// txtProcess.AppendText(Environment.NewLine);
|
|
||||||
// txtProcess.AppendText(Environment.NewLine);
|
|
||||||
// txtProcess.AppendText("No existing ro.fst in path " + roFstInfo.MyRODb.FolderPath + ". Check for invalid path");
|
|
||||||
// txtProcess.AppendText(Environment.NewLine);
|
|
||||||
// txtProcess.AppendText(Environment.NewLine);
|
|
||||||
// txtResults.AppendText("No existing ro.fst in path " + roFstInfo.MyRODb.FolderPath + ". Check for invalid path");
|
|
||||||
// txtResults.AppendText(Environment.NewLine);
|
|
||||||
// txtResults.AppendText(Environment.NewLine);
|
|
||||||
// return;
|
|
||||||
//}
|
|
||||||
|
|
||||||
Cursor = Cursors.WaitCursor;
|
|
||||||
int numBadROLinks = 0;
|
|
||||||
using (DocVersion dv = DocVersion.Get(dq.VersionID))
|
|
||||||
{
|
|
||||||
// B2022-026 RO Memory Reduction code - first load the new ro.fst so that we can assign the ROTableUpdate event to the correct roFstInfo
|
|
||||||
//if (dv.ROfstLoadingFigures || dv.NewerRoFst) // B2017-125 see if loading figures was completed
|
|
||||||
//{
|
|
||||||
// // only load the RO.fst
|
|
||||||
// ROFstInfo.UpdateRoFst(roFstInfo.MyRODb, dv, roFstInfo, DoProgressBarRefresh);
|
|
||||||
// roFstInfo = dq.DocVersionAssociations[0].MyROFst;
|
|
||||||
//}
|
|
||||||
//roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
|
|
||||||
//ROFst newrofst = ROFstInfo.RefreshROFst(dv, roFstInfo, DoProgressBarRefresh, txtProcess);
|
|
||||||
//roFstInfo.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
|
|
||||||
numBadROLinks = ROFstInfo.DoCheckROLinksInProcedures(dv, DoProgressBarRefresh, txtProcess);
|
|
||||||
}
|
|
||||||
|
|
||||||
Cursor = Cursors.Default;
|
|
||||||
ProgressBar.ColorTable = eProgressBarItemColor.Normal;
|
|
||||||
FinalProgressBarMessage = "RO Links Checked";
|
|
||||||
txtProcess.AppendText(Environment.NewLine);
|
|
||||||
txtProcess.AppendText(Environment.NewLine);
|
|
||||||
//txtResults.AppendText("RO links Checked");
|
|
||||||
//txtResults.AppendText(Environment.NewLine);
|
|
||||||
if (numBadROLinks > 0)
|
|
||||||
{
|
|
||||||
badLinksFound = true;
|
|
||||||
txtResults.AppendText(string.Format("{0} Bad RO Links were Found", numBadROLinks));
|
|
||||||
txtResults.AppendText(Environment.NewLine);
|
|
||||||
txtResults.AppendText("A \"Bad RO Link\" Annotation was Placed at each Step Location");
|
|
||||||
txtResults.AppendText(Environment.NewLine);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
txtResults.AppendText("No Bad RO Links were Detected");
|
|
||||||
txtResults.AppendText(Environment.NewLine);
|
|
||||||
txtResults.AppendText(Environment.NewLine);
|
|
||||||
return badLinksFound;
|
|
||||||
}
|
|
||||||
// B2018-002 - Invalid Transitions - Define Transition Refresh Statistics
|
// B2018-002 - Invalid Transitions - Define Transition Refresh Statistics
|
||||||
private int numTransProcessed = 0;
|
private int numTransProcessed = 0;
|
||||||
private int numTransFixed = 0;
|
private int numTransFixed = 0;
|
||||||
|
@ -256,42 +256,19 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return fixedROs;
|
return fixedROs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//C2022-028 for Admin tool to check for bad RO links
|
//C2022-028 for Admin tool to check for bad RO links
|
||||||
public static int DoCheckROLinksInProcedures(DocVersion docver, ROFstInfoProgressBarRefresh myProgressBarRefresh, System.Windows.Forms.TextBox tbStatus)
|
//B2022-144 we now loop through checked procedures list from Admin Tools and call this method for each procedure we want to process
|
||||||
{
|
public static int CheckROLinksInThisProcedure(ProcedureInfo proc, System.Windows.Forms.TextBox tbStatus)
|
||||||
/**** commented out for now - keep in case we decide to try to fix some of the RO links
|
|
||||||
//ROFst rofst = null;
|
|
||||||
//rofst = docver.DocVersionAssociations[0].MyROFst;
|
|
||||||
***/
|
|
||||||
|
|
||||||
DocVersionInfo dvi = DocVersionInfo.Get(docver.VersionID);
|
|
||||||
|
|
||||||
int badROLinks = CheckROLinksInProcedures(dvi, myProgressBarRefresh, tbStatus);
|
|
||||||
|
|
||||||
myProgressBarRefresh(100, 100, "Check RO Links Complete"); // update the progress bar
|
|
||||||
System.Windows.Forms.Application.DoEvents();
|
|
||||||
|
|
||||||
// pop up a message window telling the user the RO Check has completed and how many bad ROs were found
|
|
||||||
// if MessageList is not null, then append the results message to it. We are running via Admin tools and doing more than one procedure set
|
|
||||||
// and will diplay the messages once after all processing is completed
|
|
||||||
if (MessageList != null)
|
|
||||||
MessageList.AppendLine((badROLinks == 0 ? "No Bad RO Links Found for " : string.Format("{0} Bad RO Links Found in ", badROLinks)) + dvi.MyFolder.Name);
|
|
||||||
|
|
||||||
return badROLinks;
|
|
||||||
}
|
|
||||||
public static int CheckROLinksInProcedures(DocVersionInfo dvi, ROFstInfoProgressBarRefresh myProgressBarRefresh, System.Windows.Forms.TextBox tbStatus)
|
|
||||||
{
|
{
|
||||||
int FoundBadROLinks = 0;
|
int FoundBadROLinks = 0;
|
||||||
|
DocVersionInfo dvi = DocVersionInfo.Get(proc.MyDocVersion.VersionID);
|
||||||
if (dvi.DocVersionConfig.SelectedSlave <= 0)
|
if (dvi.DocVersionConfig.SelectedSlave <= 0)
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
foreach (ProcedureInfo proc in dvi.Procedures)
|
|
||||||
{
|
|
||||||
DateTime start = DateTime.Now;
|
DateTime start = DateTime.Now;
|
||||||
|
|
||||||
ProcedureInfo.ResetCheckROLinkCounters();
|
ProcedureInfo.ResetCheckROLinkCounters();
|
||||||
myProgressBarRefresh(++i, dvi.Procedures.Count, string.Format("{0} ({1}/{2} ROs)", proc.DisplayNumber, i, dvi.Procedures.Count));
|
|
||||||
ProcedureInfo.CheckReferenceObjectsLinks(proc);
|
ProcedureInfo.CheckReferenceObjectsLinks(proc);
|
||||||
FoundBadROLinks += ProcedureInfo.BadROLinksCount;
|
FoundBadROLinks += ProcedureInfo.BadROLinksCount;
|
||||||
|
|
||||||
@ -303,7 +280,6 @@ namespace VEPROMS.CSLA.Library
|
|||||||
//tbStatus.AppendText(string.Format("Procedure: {1}{0}, Checked {2} Referenced Objects Links{0}, Found {3} Bad RO Links{0}, Fixed {4} Bad RO Links{0} Elapsed Seconds:{5}{0}{0}", Environment.NewLine, proc.DisplayNumber, ProcedureInfo.CheckROLinksCount, ProcedureInfo.BadROLinksCount, ProcedureInfo.FixedROLinksCount, ts.TotalSeconds));
|
//tbStatus.AppendText(string.Format("Procedure: {1}{0}, Checked {2} Referenced Objects Links{0}, Found {3} Bad RO Links{0}, Fixed {4} Bad RO Links{0} Elapsed Seconds:{5}{0}{0}", Environment.NewLine, proc.DisplayNumber, ProcedureInfo.CheckROLinksCount, ProcedureInfo.BadROLinksCount, ProcedureInfo.FixedROLinksCount, ts.TotalSeconds));
|
||||||
***/
|
***/
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return FoundBadROLinks; // return the total number of bad RO links (in step text only) for the entire procedure set
|
return FoundBadROLinks; // return the total number of bad RO links (in step text only) for the entire procedure set
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
@ -61,8 +61,8 @@ Global
|
|||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|x86.ActiveCfg = Debug|x86
|
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|x86.Build.0 = Debug|x86
|
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -89,8 +89,8 @@ Global
|
|||||||
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Release|x86.Build.0 = Release|x86
|
{8556527C-6615-487F-8AF7-22EBC3EF0268}.Release|x86.Build.0 = Release|x86
|
||||||
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|x86.ActiveCfg = Debug|x86
|
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|x86.Build.0 = Debug|x86
|
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -117,8 +117,8 @@ Global
|
|||||||
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Release|x86.Build.0 = Release|x86
|
{41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Release|x86.Build.0 = Release|x86
|
||||||
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|x86.ActiveCfg = Debug|x86
|
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|x86.Build.0 = Debug|x86
|
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -144,8 +144,8 @@ Global
|
|||||||
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Release|x86.ActiveCfg = Release|x86
|
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Release|x86.ActiveCfg = Release|x86
|
||||||
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Release|x86.Build.0 = Release|x86
|
{8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Release|x86.Build.0 = Release|x86
|
||||||
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|x86.ActiveCfg = Debug|x86
|
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|x86.Build.0 = Debug|x86
|
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -171,8 +171,8 @@ Global
|
|||||||
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Release|x86.Build.0 = Release|x86
|
{34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Release|x86.Build.0 = Release|x86
|
||||||
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|x86.ActiveCfg = Debug|x86
|
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|x86.Build.0 = Debug|x86
|
{52D74078-3822-410E-889B-464BD21AAB9E}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -199,8 +199,8 @@ Global
|
|||||||
{52D74078-3822-410E-889B-464BD21AAB9E}.Release|x86.Build.0 = Release|x86
|
{52D74078-3822-410E-889B-464BD21AAB9E}.Release|x86.Build.0 = Release|x86
|
||||||
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|x86.ActiveCfg = Debug|x86
|
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|x86.Build.0 = Debug|x86
|
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -227,8 +227,8 @@ Global
|
|||||||
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Release|x86.Build.0 = Release|x86
|
{04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Release|x86.Build.0 = Release|x86
|
||||||
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|x86.ActiveCfg = Debug|x86
|
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|x86.Build.0 = Debug|x86
|
{70F23722-19A3-4AC1-A900-55831C945786}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -253,8 +253,8 @@ Global
|
|||||||
{70F23722-19A3-4AC1-A900-55831C945786}.Release|x86.Build.0 = Release|x86
|
{70F23722-19A3-4AC1-A900-55831C945786}.Release|x86.Build.0 = Release|x86
|
||||||
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|x86.ActiveCfg = Debug|x86
|
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|x86.Build.0 = Debug|x86
|
{94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -331,8 +331,8 @@ Global
|
|||||||
{AEEE9FD1-6892-45E2-A67E-418C06D46FF9}.Release|x86.Build.0 = Release|x86
|
{AEEE9FD1-6892-45E2-A67E-418C06D46FF9}.Release|x86.Build.0 = Release|x86
|
||||||
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|x86.ActiveCfg = Debug|x86
|
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|x86.Build.0 = Debug|x86
|
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -357,8 +357,8 @@ Global
|
|||||||
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Release|x86.Build.0 = Release|x86
|
{23DECB23-7CEA-433E-88BD-67DA7689B89E}.Release|x86.Build.0 = Release|x86
|
||||||
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|x86.ActiveCfg = Debug|x86
|
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|x86.Build.0 = Debug|x86
|
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|x86.Build.0 = Debug|x86
|
||||||
@ -383,8 +383,8 @@ Global
|
|||||||
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Release|x86.Build.0 = Release|x86
|
{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Release|x86.Build.0 = Release|x86
|
||||||
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||||
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||||
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|x86.ActiveCfg = Debug|x86
|
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|x86.Build.0 = Debug|x86
|
{62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|x86.Build.0 = Debug|x86
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
</UpgradeBackupLocation>
|
</UpgradeBackupLocation>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
@ -12,7 +12,7 @@ namespace Volian.Controls.Library.Properties {
|
|||||||
|
|
||||||
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
|
||||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||||
|
|
||||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
@ -108,7 +108,7 @@
|
|||||||
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||||
<Reference Include="Interop.EDWordLib, Version=8.0.0.0, Culture=neutral, processorArchitecture=x86">
|
<Reference Include="Interop.EDWordLib, Version=8.0.0.0, Culture=neutral, processorArchitecture=x86">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
<EmbedInteropTypes>False</EmbedInteropTypes>
|
||||||
<HintPath>..\..\..\..\3rdPartyLibraries\Edraw\Interop.EDWordLib.dll</HintPath>
|
<HintPath>..\..\..\..\3rdPartyLibraries\Edraw\Interop.EDWordLib.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
|
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
|
||||||
|
@ -12,4 +12,4 @@
|
|||||||
</setting>
|
</setting>
|
||||||
</Volian.Controls.Library.Properties.Settings>
|
</Volian.Controls.Library.Properties.Settings>
|
||||||
</userSettings>
|
</userSettings>
|
||||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>Volian.Pipe.Library</RootNamespace>
|
<RootNamespace>Volian.Pipe.Library</RootNamespace>
|
||||||
<AssemblyName>Volian.Pipe.Library</AssemblyName>
|
<AssemblyName>Volian.Pipe.Library</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
<SccProjectName>"%24/PROMS/Volian.Pipe.Library", RQGAAAAA</SccProjectName>
|
<SccProjectName>"%24/PROMS/Volian.Pipe.Library", RQGAAAAA</SccProjectName>
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
</UpgradeBackupLocation>
|
</UpgradeBackupLocation>
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user