diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-14 13:11:32 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-14 13:11:32 +0300 |
| commit | 0bf4df21349aa175405ad3b462d466a72363dee4 (patch) | |
| tree | 486fd444e7a2f17586308a05fe2a2960cab608ad /Software/Visual_Studio | |
| parent | 9c2939ac72bdb7501ce19236c60ab5f584247fb4 (diff) | |
| download | Tango-0bf4df21349aa175405ad3b462d466a72363dee4.tar.gz Tango-0bf4df21349aa175405ad3b462d466a72363dee4.zip | |
Reorganization of solution build paths !
Optimized production packages.
Diffstat (limited to 'Software/Visual_Studio')
123 files changed, 1981 insertions, 2149 deletions
diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk Binary files differnew file mode 100644 index 000000000..aff43b505 --- /dev/null +++ b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk Binary files differnew file mode 100644 index 000000000..7a824be9f --- /dev/null +++ b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk diff --git a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk Binary files differnew file mode 100644 index 000000000..482e642bf --- /dev/null +++ b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk diff --git a/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk b/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk Binary files differnew file mode 100644 index 000000000..221194e27 --- /dev/null +++ b/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk diff --git a/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk b/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk Binary files differnew file mode 100644 index 000000000..1e89fe5fc --- /dev/null +++ b/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk diff --git a/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj b/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj index 71cb4c8b5..317832671 100644 --- a/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj +++ b/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj @@ -72,7 +72,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <OutDir>$(SolutionDir)Build\Debug</OutDir> + <OutDir>$(SolutionDir)Build\Native\Debug</OutDir> <IncludePath>$(IncludePath)</IncludePath> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -80,7 +80,7 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <OutDir>$(SolutionDir)Build\Debug</OutDir> + <OutDir>$(SolutionDir)Build\Native\Release</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> @@ -98,7 +98,7 @@ <SubSystem>Windows</SubSystem> </Link> <PreBuildEvent> - <Command>"$(TargetDir)proto-tc.exe" -i "$(SolutionDir)..\PMR\Messages" -o "$(SolutionDir)Embroidery\Tango.Embroidery\PMR" -l C -c "Embroidery"</Command> + <Command>"$(SolutionDir)Build\Utilities\Debug\proto-tc.exe" -i "$(SolutionDir)..\PMR\Messages" -o "$(SolutionDir)Embroidery\Tango.Embroidery\PMR" -l C -c "Embroidery"</Command> </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> diff --git a/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj b/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj index 24b9ba8dd..40a50efdf 100644 --- a/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj +++ b/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj @@ -72,14 +72,14 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <OutDir>$(SolutionDir)Build\Debug</OutDir> + <OutDir>$(SolutionDir)Build\Native\Debug</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <OutDir>$(SolutionDir)Build\Release</OutDir> + <OutDir>$(SolutionDir)Build\Native\Release</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> diff --git a/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj b/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj index 8d15fc0d0..f058c298e 100644 --- a/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj +++ b/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj @@ -43,12 +43,12 @@ <_ProjectFileVersion>14.0.25123.0</_ProjectFileVersion> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)Build\Debug</OutDir> + <OutDir>$(SolutionDir)Build\Native\Debug</OutDir> <IntDir>$(Configuration)\</IntDir> <LinkIncremental>true</LinkIncremental> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)Build\Release</OutDir> + <OutDir>$(SolutionDir)Build\Native\Release</OutDir> <IntDir>$(Configuration)\</IntDir> <LinkIncremental>false</LinkIncremental> </PropertyGroup> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj index 640017669..a0d471522 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj index 7a905fa24..393c4e491 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj index 7c7c8c272..a8cd6b1cd 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj index c361a584d..bd7484de8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -188,10 +188,6 @@ </None> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\Embroidery\Tango.EmbroideryUI\Tango.EmbroideryUI.csproj"> - <Project>{bdbbe284-f564-4f51-af41-3df0434cec62}</Project> - <Name>Tango.EmbroideryUI</Name> - </ProjectReference> <ProjectReference Include="..\..\..\SideChains\ColorMine\ColorMine.csproj"> <Project>{37e4ceab-b54b-451f-b535-04cf7da9c459}</Project> <Name>ColorMine</Name> @@ -224,6 +220,10 @@ <Project>{b112d89a-a106-41ae-a0c1-4abc84c477f5}</Project> <Name>Tango.DragAndDrop</Name> </ProjectReference> + <ProjectReference Include="..\..\..\Tango.EmbroideryUI\Tango.EmbroideryUI.csproj"> + <Project>{bdbbe284-f564-4f51-af41-3df0434cec62}</Project> + <Name>Tango.EmbroideryUI</Name> + </ProjectReference> <ProjectReference Include="..\..\..\Tango.Hive\Tango.Hive.csproj"> <Project>{942134ac-6ea2-4500-8f22-0f739b70a05f}</Project> <Name>Tango.Hive</Name> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj index 13f075684..89942c6d6 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj index 24045f723..f3318f275 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj index 6af746c31..0d6708246 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj index 73a8b9413..1c9ae5147 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj index 392958290..e8df35ba8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -27,7 +27,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -158,10 +158,6 @@ <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>Resources.Designer.cs</LastGenOutput> </EmbeddedResource> - <Content Include="..\..\..\..\DB\Tango.db"> - <Link>Tango.db</Link> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </Content> <None Include="App.config" /> <None Include="packages.config" /> <None Include="Properties\Settings.settings"> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj index 14b88de03..8490800ad 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj index 000e44919..48fe2b34c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\</OutputPath> + <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj index ef8d57885..6d6803076 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Release\</OutputPath> + <OutputPath>..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Installer/Tango.MachineStudio.Installer.vdproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Installer/Tango.MachineStudio.Installer.vdproj index 8e2125ece..3d8330858 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Installer/Tango.MachineStudio.Installer.vdproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Installer/Tango.MachineStudio.Installer.vdproj @@ -22,7 +22,7 @@ "Entry" { "MsmKey" = "8:_00AB5F4CB0B9DCC466359F8589533B68" - "OwnerKey" = "8:_9313675002CAB896AA36284B33284921" + "OwnerKey" = "8:_94B0EAFC6BCADB7C6DC2EF31467C8C24" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -45,73 +45,73 @@ } "Entry" { - "MsmKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "OwnerKey" = "8:_43CFBD6EDF110CDEE3F67BDBFC3896C5" + "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "OwnerKey" = "8:_2A89CEAD3955B34E5DD360E38A7B88D8" + "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" + "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" + "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "OwnerKey" = "8:_FC1610908696F9023D51C2E568128AC2" + "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "OwnerKey" = "8:_AAC651516A7389ACE7743F8E6CF6D9AB" + "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "OwnerKey" = "8:_86870D3B7B8EDDEE5AC5CA6E385C1CC6" + "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "OwnerKey" = "8:_9E660063B542815E08A7C12DF8A34878" + "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "OwnerKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" + "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } @@ -135,686 +135,422 @@ } "Entry" { - "MsmKey" = "8:_0F87989D267539411500CFE68C908375" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_136196DD2763419D959721C2BA143498" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_13803D82858878E2D3953D4742A1A596" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_4A177C28F7864675BCA7A0910494A760" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_14CF2DBBA5462C65F94A9137DCE014F9" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_2A89CEAD3955B34E5DD360E38A7B88D8" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_FC1610908696F9023D51C2E568128AC2" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_AAC651516A7389ACE7743F8E6CF6D9AB" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_86870D3B7B8EDDEE5AC5CA6E385C1CC6" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_9E660063B542815E08A7C12DF8A34878" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_EB16994750C856659A7BE41BD02F8ABE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_43CFBD6EDF110CDEE3F67BDBFC3896C5" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_D6A37AFBBBDA445164B68F2E7D5B3E80" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_173C4B05CE04BA34E920DC64B25A8670" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" - "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_F1DFFB8E50BAD2529B0C859268ED8956" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1910D5B276479C48B4F7762A638405F5" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1AC47588060EAA9F2B7A13EC07359D10" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1BDA3B7B2EF85A48708A41568E05F63F" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1D6707E8224A79E8681FCB390AE53B73" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "OwnerKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1D6707E8224A79E8681FCB390AE53B73" + "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1D6707E8224A79E8681FCB390AE53B73" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" - "OwnerKey" = "8:_637D6BEFFCB850675DD5A053B16A90CC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" - "OwnerKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" - "OwnerKey" = "8:_0BF8133A6082FDD658EA3570802D86DE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" - "OwnerKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" + "MsmKey" = "8:_0E196D84800B9656BC318F85626EFE05" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_213B2D91506C177B03F29F3DEA02D77C" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_213B2D91506C177B03F29F3DEA02D77C" + "MsmKey" = "8:_13428C81458C52275C0A41D014521151" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_21E475E8F9DBB207476AD595250634BF" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "MsmKey" = "8:_136196DD2763419D959721C2BA143498" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_21E475E8F9DBB207476AD595250634BF" + "MsmKey" = "8:_13803D82858878E2D3953D4742A1A596" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_21E475E8F9DBB207476AD595250634BF" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2444D22B50272EAE03F2B5D2457335EC" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_244F067B77DB6F9852E2286427480A18" + "MsmKey" = "8:_14CF2DBBA5462C65F94A9137DCE014F9" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2589A08E4AC51C4B69842E948EFC87DB" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_173C4B05CE04BA34E920DC64B25A8670" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" + "MsmKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" - "OwnerKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" - "OwnerKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" + "MsmKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" - "OwnerKey" = "8:_BA22D23CB5304B5389C531581B1D5C63" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_26BF1219019A4367BA3497A5899C05B1" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_1910D5B276479C48B4F7762A638405F5" + "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_283F49175556E95BE98A7C8600F4030B" + "MsmKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_314EDD4023EE398834106084EB82B617" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_2A89CEAD3955B34E5DD360E38A7B88D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_CF21DC4ED06B5E41D3B7A39D1820BDBE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_637D6BEFFCB850675DD5A053B16A90CC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_3CB3468A9D276D6877D2AEBE41A9D67C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" + "MsmKey" = "8:_1AC47588060EAA9F2B7A13EC07359D10" + "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_FC1610908696F9023D51C2E568128AC2" + "MsmKey" = "8:_1BDA3B7B2EF85A48708A41568E05F63F" + "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_AAC651516A7389ACE7743F8E6CF6D9AB" + "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" + "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" + "OwnerKey" = "8:_0BF8133A6082FDD658EA3570802D86DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_86870D3B7B8EDDEE5AC5CA6E385C1CC6" + "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" + "OwnerKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_9E660063B542815E08A7C12DF8A34878" + "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" + "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" + "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_94F728AD3014EE7BB551FB6A29DC0705" + "MsmKey" = "8:_2423100AF29217C4332A90074E54D4D0" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "MsmKey" = "8:_2444D22B50272EAE03F2B5D2457335EC" + "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_43CFBD6EDF110CDEE3F67BDBFC3896C5" + "MsmKey" = "8:_244F067B77DB6F9852E2286427480A18" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" + "MsmKey" = "8:_2589A08E4AC51C4B69842E948EFC87DB" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" + "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_52F0C34C64530B37BEE83F9DE86EB59A" + "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" + "OwnerKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_6F9B747A4443266580CBCA4DBC2AFCA9" + "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" + "OwnerKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" + "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" + "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_89F5A3B2E6E527F5F7B84DBCACA1BC6A" + "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "OwnerKey" = "8:_2BD84519E06924727E32B6E35D589702" + "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" + "OwnerKey" = "8:_BA22D23CB5304B5389C531581B1D5C63" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" + "MsmKey" = "8:_26BF1219019A4367BA3497A5899C05B1" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2A89CEAD3955B34E5DD360E38A7B88D8" + "MsmKey" = "8:_283F49175556E95BE98A7C8600F4030B" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2BD84519E06924727E32B6E35D589702" + "MsmKey" = "8:_2EB48F8299C56A3911017460C55FDA43" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2BD84519E06924727E32B6E35D589702" - "OwnerKey" = "8:_637D6BEFFCB850675DD5A053B16A90CC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2BD84519E06924727E32B6E35D589702" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_89F5A3B2E6E527F5F7B84DBCACA1BC6A" + "MsmKey" = "8:_2EB48F8299C56A3911017460C55FDA43" + "OwnerKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" + "MsmKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_2A89CEAD3955B34E5DD360E38A7B88D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_FC1610908696F9023D51C2E568128AC2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_AAC651516A7389ACE7743F8E6CF6D9AB" + "MsmKey" = "8:_2F23291F311EE9576449E5628A5702AE" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "MsmKey" = "8:_2F23291F311EE9576449E5628A5702AE" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_86870D3B7B8EDDEE5AC5CA6E385C1CC6" + "MsmKey" = "8:_2F23291F311EE9576449E5628A5702AE" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" + "MsmKey" = "8:_2F23291F311EE9576449E5628A5702AE" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_9E660063B542815E08A7C12DF8A34878" + "MsmKey" = "8:_2F23291F311EE9576449E5628A5702AE" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_43CFBD6EDF110CDEE3F67BDBFC3896C5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2EB48F8299C56A3911017460C55FDA43" + "MsmKey" = "8:_2F23291F311EE9576449E5628A5702AE" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2EB48F8299C56A3911017460C55FDA43" - "OwnerKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_2FA2B573783C66016BCED4EA9D33E5B6" "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_314EDD4023EE398834106084EB82B617" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_359F09B8EC59D6FC1859EFF3D2274920" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_314EDD4023EE398834106084EB82B617" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_2A89CEAD3955B34E5DD360E38A7B88D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_637D6BEFFCB850675DD5A053B16A90CC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_3CB3468A9D276D6877D2AEBE41A9D67C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_9E660063B542815E08A7C12DF8A34878" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_43CFBD6EDF110CDEE3F67BDBFC3896C5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" + "MsmKey" = "8:_382ADCBEA6FF11871606FD406333761E" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" + "MsmKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "MsmKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" + "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" - "OwnerKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" + "MsmKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -849,110 +585,104 @@ } "Entry" { - "MsmKey" = "8:_3CB3468A9D276D6877D2AEBE41A9D67C" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3CB3468A9D276D6877D2AEBE41A9D67C" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_3E6534AA37C9012ED3BDF4DCB02EFDB6" + "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3E6534AA37C9012ED3BDF4DCB02EFDB6" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_3CB3468A9D276D6877D2AEBE41A9D67C" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_43CFBD6EDF110CDEE3F67BDBFC3896C5" + "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" + "OwnerKey" = "8:_7F2A242EE11515CC12A6793521574B9B" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_D470E365B719E131A541EC96D73484A0" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" + "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" + "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" + "OwnerKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "MsmKey" = "8:_4446241C89A5162FB80809A05F581472" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_43CFBD6EDF110CDEE3F67BDBFC3896C5" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_4446241C89A5162FB80809A05F581472" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -987,13 +717,43 @@ } "Entry" { - "MsmKey" = "8:_492411C750E878FDDEC853B5BD1B42A4" + "MsmKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4A177C28F7864675BCA7A0910494A760" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4A177C28F7864675BCA7A0910494A760" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } @@ -1006,7 +766,7 @@ "Entry" { "MsmKey" = "8:_4DE31F37261519B6E72F89F737E10A45" - "OwnerKey" = "8:_314EDD4023EE398834106084EB82B617" + "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1078,239 +838,263 @@ "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_2A89CEAD3955B34E5DD360E38A7B88D8" + "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "OwnerKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_637D6BEFFCB850675DD5A053B16A90CC" + "OwnerKey" = "8:_709D007D7E89A10E63C141E3A08311FD" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_AAC651516A7389ACE7743F8E6CF6D9AB" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_86870D3B7B8EDDEE5AC5CA6E385C1CC6" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_43CFBD6EDF110CDEE3F67BDBFC3896C5" + "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_2BD84519E06924727E32B6E35D589702" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_6C905EAE2E8F3F1F9F11F2E1A1B5B79D" + "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" + "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_709D007D7E89A10E63C141E3A08311FD" + "OwnerKey" = "8:_EA4D0354739F3915FC03731153325AA5" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "OwnerKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5267D1EC981D54EC20D1B42EDAB938D2" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "OwnerKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5267D1EC981D54EC20D1B42EDAB938D2" - "OwnerKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_52F0C34C64530B37BEE83F9DE86EB59A" + "MsmKey" = "8:_55D25B13F818972AA7BF22C7264EBB19" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_52F0C34C64530B37BEE83F9DE86EB59A" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" + "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_53F62E6A8312202486ED187D9643BAF5" - "OwnerKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" + "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_53F62E6A8312202486ED187D9643BAF5" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "OwnerKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_53F62E6A8312202486ED187D9643BAF5" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" + "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "OwnerKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_53F62E6A8312202486ED187D9643BAF5" - "OwnerKey" = "8:_637D6BEFFCB850675DD5A053B16A90CC" + "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_53F62E6A8312202486ED187D9643BAF5" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "MsmKey" = "8:_5747A410B7984793A0F6D9121679C6F3" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_53F62E6A8312202486ED187D9643BAF5" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_53F62E6A8312202486ED187D9643BAF5" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_53F62E6A8312202486ED187D9643BAF5" - "OwnerKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_53F62E6A8312202486ED187D9643BAF5" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_53F62E6A8312202486ED187D9643BAF5" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_53F62E6A8312202486ED187D9643BAF5" - "OwnerKey" = "8:_2BD84519E06924727E32B6E35D589702" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_53F62E6A8312202486ED187D9643BAF5" - "OwnerKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_55D25B13F818972AA7BF22C7264EBB19" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" - "OwnerKey" = "8:_314EDD4023EE398834106084EB82B617" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" - "OwnerKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" - "OwnerKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5747A410B7984793A0F6D9121679C6F3" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "MsmKey" = "8:_5BB4E116AC988395D2A72901433A7CB9" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_5BB4E116AC988395D2A72901433A7CB9" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5BB4E116AC988395D2A72901433A7CB9" + "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_5C5582DB321E2CC26F8F1FBF8B4866F0" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" "OwnerKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" "MsmSig" = "8:_UNDEFINED" @@ -1318,37 +1102,37 @@ "Entry" { "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_2A89CEAD3955B34E5DD360E38A7B88D8" + "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_1D6707E8224A79E8681FCB390AE53B73" + "OwnerKey" = "8:_69CC8DD07F81DD7EA883434F53157FBC" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_53F62E6A8312202486ED187D9643BAF5" + "OwnerKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" + "OwnerKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" + "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1383,6 +1167,12 @@ } "Entry" { + "MsmKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_62EC6F0F04E5435ABCC0479D48BEBE1B" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" @@ -1407,110 +1197,134 @@ } "Entry" { - "MsmKey" = "8:_637D6BEFFCB850675DD5A053B16A90CC" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" + "OwnerKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_637D6BEFFCB850675DD5A053B16A90CC" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" + "OwnerKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" - "OwnerKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" - "OwnerKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" + "OwnerKey" = "8:_712AAF71834640D10C755D415AF2200C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" - "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" + "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" + "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" - "OwnerKey" = "8:_712AAF71834640D10C755D415AF2200C" + "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6C905EAE2E8F3F1F9F11F2E1A1B5B79D" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" + "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6C905EAE2E8F3F1F9F11F2E1A1B5B79D" - "OwnerKey" = "8:_637D6BEFFCB850675DD5A053B16A90CC" + "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" + "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6C905EAE2E8F3F1F9F11F2E1A1B5B79D" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6D9156D5DBF08959BE20FE18FA09E71A" + "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" + "OwnerKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_69CC8DD07F81DD7EA883434F53157FBC" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_69CC8DD07F81DD7EA883434F53157FBC" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_69CC8DD07F81DD7EA883434F53157FBC" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_6AE2958999F8B1E88D8475CB3E791CF2" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" + "MsmKey" = "8:_6AE2958999F8B1E88D8475CB3E791CF2" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" - "OwnerKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" + "MsmKey" = "8:_6D9156D5DBF08959BE20FE18FA09E71A" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6F9B747A4443266580CBCA4DBC2AFCA9" - "OwnerKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" + "MsmKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" + "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6F9B747A4443266580CBCA4DBC2AFCA9" + "MsmKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6F9B747A4443266580CBCA4DBC2AFCA9" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" + "MsmKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" + "OwnerKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1528,31 +1342,31 @@ "Entry" { "MsmKey" = "8:_712AAF71834640D10C755D415AF2200C" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_712AAF71834640D10C755D415AF2200C" - "OwnerKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_712AAF71834640D10C755D415AF2200C" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_712AAF71834640D10C755D415AF2200C" - "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_73674B32069839371DC47411D1B7EBE0" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1563,6 +1377,54 @@ } "Entry" { + "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" "MsmSig" = "8:_UNDEFINED" @@ -1570,7 +1432,7 @@ "Entry" { "MsmKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" - "OwnerKey" = "8:_314EDD4023EE398834106084EB82B617" + "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1611,67 +1473,61 @@ } "Entry" { - "MsmKey" = "8:_7E765F76FDFC3DCF4EAEB59B5546B063" + "MsmKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_847DE93907D7F6B17C0694F74120086B" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_7A0D754929705CC64EF84E26BD75D642" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_86870D3B7B8EDDEE5AC5CA6E385C1CC6" + "MsmKey" = "8:_7A0D754929705CC64EF84E26BD75D642" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_877DF22E1E92563A6F4E77209D76B185" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_7A0D754929705CC64EF84E26BD75D642" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_896E731F0FFC039A04E0A4482B3FED1F" + "MsmKey" = "8:_7E765F76FDFC3DCF4EAEB59B5546B063" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_89F5A3B2E6E527F5F7B84DBCACA1BC6A" + "MsmKey" = "8:_7F2A242EE11515CC12A6793521574B9B" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_89F5A3B2E6E527F5F7B84DBCACA1BC6A" - "OwnerKey" = "8:_2A89CEAD3955B34E5DD360E38A7B88D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_89F5A3B2E6E527F5F7B84DBCACA1BC6A" - "OwnerKey" = "8:_FC1610908696F9023D51C2E568128AC2" + "MsmKey" = "8:_7F2A242EE11515CC12A6793521574B9B" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_89F5A3B2E6E527F5F7B84DBCACA1BC6A" - "OwnerKey" = "8:_AAC651516A7389ACE7743F8E6CF6D9AB" + "MsmKey" = "8:_847DE93907D7F6B17C0694F74120086B" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_89F5A3B2E6E527F5F7B84DBCACA1BC6A" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "MsmKey" = "8:_877DF22E1E92563A6F4E77209D76B185" + "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" + "MsmKey" = "8:_896E731F0FFC039A04E0A4482B3FED1F" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } @@ -1696,7 +1552,7 @@ "Entry" { "MsmKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" - "OwnerKey" = "8:_314EDD4023EE398834106084EB82B617" + "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1708,180 +1564,198 @@ "Entry" { "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" + "OwnerKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "OwnerKey" = "8:_3CB3468A9D276D6877D2AEBE41A9D67C" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "OwnerKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9313675002CAB896AA36284B33284921" + "MsmKey" = "8:_94B0EAFC6BCADB7C6DC2EF31467C8C24" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_94F728AD3014EE7BB551FB6A29DC0705" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "MsmKey" = "8:_95A39C4C0476DF1F27B60A43C00DEAB7" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_94F728AD3014EE7BB551FB6A29DC0705" + "MsmKey" = "8:_95A39C4C0476DF1F27B60A43C00DEAB7" + "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_967E9E20CB6B9C494DFC2637B6384B13" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_94F728AD3014EE7BB551FB6A29DC0705" - "OwnerKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" + "MsmKey" = "8:_967E9E20CB6B9C494DFC2637B6384B13" + "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_95A39C4C0476DF1F27B60A43C00DEAB7" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_95A39C4C0476DF1F27B60A43C00DEAB7" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_967E9E20CB6B9C494DFC2637B6384B13" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_967E9E20CB6B9C494DFC2637B6384B13" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_983D79DC449AD65746DD38E6468BD886" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_98D5175644A3BC174BCA498A1B20FF84" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" - "OwnerKey" = "8:_4DE31F37261519B6E72F89F737E10A45" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" - "OwnerKey" = "8:_448950FC944968D96107991185C22806" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" - "OwnerKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" - "OwnerKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9A234F7FB4239AC3DB0DBE9415BDE695" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9A234F7FB4239AC3DB0DBE9415BDE695" + "MsmKey" = "8:_983D79DC449AD65746DD38E6468BD886" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9A234F7FB4239AC3DB0DBE9415BDE695" - "OwnerKey" = "8:_2A89CEAD3955B34E5DD360E38A7B88D8" + "MsmKey" = "8:_98D5175644A3BC174BCA498A1B20FF84" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9A234F7FB4239AC3DB0DBE9415BDE695" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" + "OwnerKey" = "8:_4DE31F37261519B6E72F89F737E10A45" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9A234F7FB4239AC3DB0DBE9415BDE695" - "OwnerKey" = "8:_FC1610908696F9023D51C2E568128AC2" + "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9CCA52D51EEDBFE9F9794A8ACD30D5D9" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" + "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9E660063B542815E08A7C12DF8A34878" - "OwnerKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" + "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" + "OwnerKey" = "8:_448950FC944968D96107991185C22806" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" + "OwnerKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9E660063B542815E08A7C12DF8A34878" + "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" + "OwnerKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9CCA52D51EEDBFE9F9794A8ACD30D5D9" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } @@ -1894,31 +1768,31 @@ "Entry" { "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" - "OwnerKey" = "8:_FC1610908696F9023D51C2E568128AC2" + "OwnerKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" - "OwnerKey" = "8:_86870D3B7B8EDDEE5AC5CA6E385C1CC6" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" - "OwnerKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" + "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" - "OwnerKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" + "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1941,12 +1815,6 @@ } "Entry" { - "MsmKey" = "8:_AAC651516A7389ACE7743F8E6CF6D9AB" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_AB0E0C1990036EFBAC9C728A9902D668" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" @@ -1971,24 +1839,36 @@ } "Entry" { - "MsmKey" = "8:_B20313AE68F1E5D38CDE24036C32E69B" + "MsmKey" = "8:_B12544C6B013F48780D190EB513A3B82" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B20313AE68F1E5D38CDE24036C32E69B" - "OwnerKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" + "MsmKey" = "8:_B12544C6B013F48780D190EB513A3B82" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "MsmKey" = "8:_B12544C6B013F48780D190EB513A3B82" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B20313AE68F1E5D38CDE24036C32E69B" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_B20313AE68F1E5D38CDE24036C32E69B" + "OwnerKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_B78AD04F5CD695E22F6F139EAC69B5A5" "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" "MsmSig" = "8:_UNDEFINED" @@ -2025,91 +1905,97 @@ } "Entry" { - "MsmKey" = "8:_C179B63E2F5A58786B70FADA6C8496A5" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C6BFB4DAD78C1798616508141EF1234E" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" + "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" + "MsmKey" = "8:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "MsmKey" = "8:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" + "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" + "MsmKey" = "8:_BF01A029E83A968C697506DFA469C90B" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "MsmKey" = "8:_BF01A029E83A968C697506DFA469C90B" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" - "OwnerKey" = "8:_9E660063B542815E08A7C12DF8A34878" + "MsmKey" = "8:_BF01A029E83A968C697506DFA469C90B" + "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" - "OwnerKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" + "MsmKey" = "8:_C179B63E2F5A58786B70FADA6C8496A5" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "MsmKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CC07BBC3C44CE424AA0EF90844590E4E" + "MsmKey" = "8:_C658BF7DEB725E94A2BAF4FD48BAD3FA" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CC7BD04781686DE3403908303698199D" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_C658BF7DEB725E94A2BAF4FD48BAD3FA" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CCD49B330E05F963B5AE73E3D04F5762" + "MsmKey" = "8:_C6BFB4DAD78C1798616508141EF1234E" + "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CC07BBC3C44CE424AA0EF90844590E4E" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CF21DC4ED06B5E41D3B7A39D1820BDBE" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" + "MsmKey" = "8:_CC7BD04781686DE3403908303698199D" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CF21DC4ED06B5E41D3B7A39D1820BDBE" + "MsmKey" = "8:_CCD49B330E05F963B5AE73E3D04F5762" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } @@ -2139,182 +2025,182 @@ } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" + "MsmKey" = "8:_D3EF38D40E0CBE1BD391303952B0493E" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" + "MsmKey" = "8:_D48D475C8BD232C2AC87A2A7C6CCA53D" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" + "MsmKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "MsmKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_3CB3468A9D276D6877D2AEBE41A9D67C" + "MsmKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "OwnerKey" = "8:_448950FC944968D96107991185C22806" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" + "MsmKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "MsmKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" + "MsmKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_9E660063B542815E08A7C12DF8A34878" + "MsmKey" = "8:_D6A37AFBBBDA445164B68F2E7D5B3E80" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_43CFBD6EDF110CDEE3F67BDBFC3896C5" + "MsmKey" = "8:_D6A37AFBBBDA445164B68F2E7D5B3E80" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "MsmKey" = "8:_D8A84B2F626300DA2E9147709713E9CB" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" + "MsmKey" = "8:_D947550594E2BF53BED76C7D7F9747D7" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "MsmKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" + "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" - "OwnerKey" = "8:_D470E365B719E131A541EC96D73484A0" + "MsmKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D3E47EC14F8EA2965223A27D1918A672" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D3E47EC14F8EA2965223A27D1918A672" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D3EF38D40E0CBE1BD391303952B0493E" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D470E365B719E131A541EC96D73484A0" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D470E365B719E131A541EC96D73484A0" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D48D475C8BD232C2AC87A2A7C6CCA53D" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" - "OwnerKey" = "8:_448950FC944968D96107991185C22806" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" - "OwnerKey" = "8:_314EDD4023EE398834106084EB82B617" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D8A84B2F626300DA2E9147709713E9CB" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D947550594E2BF53BED76C7D7F9747D7" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D9EF522BC47ECC080EE226A759300C15" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D9EF522BC47ECC080EE226A759300C15" - "OwnerKey" = "8:_43CFBD6EDF110CDEE3F67BDBFC3896C5" + "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "OwnerKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2343,56 +2229,104 @@ } "Entry" { - "MsmKey" = "8:_DD39CE828177428F0CEE9385B5645996" + "MsmKey" = "8:_DD77D7B58FFDC37F83D85D632BEC9DC4" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DD39CE828177428F0CEE9385B5645996" - "OwnerKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" + "MsmKey" = "8:_DE3FACD5F197D2E261A0C6B32E0D1CAC" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DD77D7B58FFDC37F83D85D632BEC9DC4" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DE3FACD5F197D2E261A0C6B32E0D1CAC" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E0573A6D7543083D0A5654271DF50643" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E0FCEE9366306B5A88DC7CF29E913A4B" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "OwnerKey" = "8:_7F2A242EE11515CC12A6793521574B9B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E1434CE35073957D38F3151D4DA22954" + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E1434CE35073957D38F3151D4DA22954" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E1434CE35073957D38F3151D4DA22954" - "OwnerKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" + "MsmKey" = "8:_E0573A6D7543083D0A5654271DF50643" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E0FCEE9366306B5A88DC7CF29E913A4B" + "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2404,7 +2338,7 @@ "Entry" { "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_314EDD4023EE398834106084EB82B617" + "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2469,62 +2403,62 @@ } "Entry" { - "MsmKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "MsmKey" = "8:_E9B6634643306242F65E192204E9C56A" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" + "MsmKey" = "8:_EA4D0354739F3915FC03731153325AA5" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" + "MsmKey" = "8:_EA4D0354739F3915FC03731153325AA5" + "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "MsmKey" = "8:_EA4D0354739F3915FC03731153325AA5" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" + "MsmKey" = "8:_EB16994750C856659A7BE41BD02F8ABE" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" - "OwnerKey" = "8:_3CB3468A9D276D6877D2AEBE41A9D67C" + "MsmKey" = "8:_EB16994750C856659A7BE41BD02F8ABE" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "MsmKey" = "8:_EB16994750C856659A7BE41BD02F8ABE" + "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" - "OwnerKey" = "8:_86870D3B7B8EDDEE5AC5CA6E385C1CC6" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2541,6 +2475,18 @@ } "Entry" { + "MsmKey" = "8:_ED524252AD28281FAE5468349D0E5797" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ED524252AD28281FAE5468349D0E5797" + "OwnerKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_EF2623DE67EDC70B584821A055B86302" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" @@ -2553,6 +2499,24 @@ } "Entry" { + "MsmKey" = "8:_F1DFFB8E50BAD2529B0C859268ED8956" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F1DFFB8E50BAD2529B0C859268ED8956" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F1DFFB8E50BAD2529B0C859268ED8956" + "OwnerKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_F3898C4F454B4D1481E055F2AB2B217B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2608,6 +2572,12 @@ "Entry" { "MsmKey" = "8:_FA58218115CCED35D22896A731510356" + "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FA58218115CCED35D22896A731510356" "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" "MsmSig" = "8:_UNDEFINED" } @@ -2679,356 +2649,416 @@ } "Entry" { - "MsmKey" = "8:_FC1610908696F9023D51C2E568128AC2" + "MsmKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_UNDEFINED" + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_314EDD4023EE398834106084EB82B617" + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2A89CEAD3955B34E5DD360E38A7B88D8" + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_492411C750E878FDDEC853B5BD1B42A4" + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0F87989D267539411500CFE68C908375" + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_213B2D91506C177B03F29F3DEA02D77C" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_CF21DC4ED06B5E41D3B7A39D1820BDBE" + "OwnerKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_B3A8AA44D6059DC53E41A988FDE4416F" + "OwnerKey" = "8:_0BF8133A6082FDD658EA3570802D86DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_637D6BEFFCB850675DD5A053B16A90CC" + "OwnerKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8A9518734ED9FAF2C17EC05C0C348448" + "OwnerKey" = "8:_7E765F76FDFC3DCF4EAEB59B5546B063" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3CB3468A9D276D6877D2AEBE41A9D67C" + "OwnerKey" = "8:_705F2A9700A0B6F6A5308537C5F876EA" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FC1610908696F9023D51C2E568128AC2" + "OwnerKey" = "8:_847DE93907D7F6B17C0694F74120086B" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_AAC651516A7389ACE7743F8E6CF6D9AB" + "OwnerKey" = "8:_EF2898B0C9AAB2E33674325B9F86943B" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_59D813DF37D45AD32E6BAE90E915CF12" + "OwnerKey" = "8:_709D007D7E89A10E63C141E3A08311FD" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_86870D3B7B8EDDEE5AC5CA6E385C1CC6" + "OwnerKey" = "8:_98D5175644A3BC174BCA498A1B20FF84" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2F39762669C91D7ACA3DA752FF966F0F" + "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9E660063B542815E08A7C12DF8A34878" + "OwnerKey" = "8:_382ADCBEA6FF11871606FD406333761E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_43CFBD6EDF110CDEE3F67BDBFC3896C5" + "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_05172E77A1E7C13177BE598549F8BD8D" + "OwnerKey" = "8:_6AE2958999F8B1E88D8475CB3E791CF2" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9A234F7FB4239AC3DB0DBE9415BDE695" + "OwnerKey" = "8:_4A177C28F7864675BCA7A0910494A760" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_21E475E8F9DBB207476AD595250634BF" + "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_94F728AD3014EE7BB551FB6A29DC0705" + "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E9C7F88E8787ECFBC3D0DDF2CD009F50" + "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1D6707E8224A79E8681FCB390AE53B73" + "OwnerKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D470E365B719E131A541EC96D73484A0" + "OwnerKey" = "8:_5267D1EC981D54EC20D1B42EDAB938D2" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_52F0C34C64530B37BEE83F9DE86EB59A" + "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_89F5A3B2E6E527F5F7B84DBCACA1BC6A" + "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2C9FFB26D0FA55FA14045BC3DAC4810A" + "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6F9B747A4443266580CBCA4DBC2AFCA9" + "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2BD84519E06924727E32B6E35D589702" + "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6C905EAE2E8F3F1F9F11F2E1A1B5B79D" + "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D3E47EC14F8EA2965223A27D1918A672" + "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9313675002CAB896AA36284B33284921" + "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D9EF522BC47ECC080EE226A759300C15" + "OwnerKey" = "8:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_15BB153128057B0BB99B99FFB6A1610A" + "OwnerKey" = "8:_7A0D754929705CC64EF84E26BD75D642" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D2CFC127042C0E0688E8BD6ACF778EBC" + "OwnerKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2A73E80FAA6901CB87461336862D4FDB" + "OwnerKey" = "8:_EB16994750C856659A7BE41BD02F8ABE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_53F62E6A8312202486ED187D9643BAF5" + "OwnerKey" = "8:_7F2A242EE11515CC12A6793521574B9B" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_39427B3257052BFADD6E291BC06EDDBB" + "OwnerKey" = "8:_D6A37AFBBBDA445164B68F2E7D5B3E80" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DD39CE828177428F0CEE9385B5645996" + "OwnerKey" = "8:_EA4D0354739F3915FC03731153325AA5" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E1434CE35073957D38F3151D4DA22954" + "OwnerKey" = "8:_C658BF7DEB725E94A2BAF4FD48BAD3FA" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" + "OwnerKey" = "8:_B12544C6B013F48780D190EB513A3B82" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0BF8133A6082FDD658EA3570802D86DE" + "OwnerKey" = "8:_5BB4E116AC988395D2A72901433A7CB9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" + "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_7E765F76FDFC3DCF4EAEB59B5546B063" + "OwnerKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" + "OwnerKey" = "8:_F1DFFB8E50BAD2529B0C859268ED8956" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_705F2A9700A0B6F6A5308537C5F876EA" + "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_847DE93907D7F6B17C0694F74120086B" + "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EF2898B0C9AAB2E33674325B9F86943B" + "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5267D1EC981D54EC20D1B42EDAB938D2" + "OwnerKey" = "8:_712AAF71834640D10C755D415AF2200C" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_709D007D7E89A10E63C141E3A08311FD" + "OwnerKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_98D5175644A3BC174BCA498A1B20FF84" + "OwnerKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" + "OwnerKey" = "8:_69CC8DD07F81DD7EA883434F53157FBC" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" + "OwnerKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_712AAF71834640D10C755D415AF2200C" + "OwnerKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" + "OwnerKey" = "8:_94B0EAFC6BCADB7C6DC2EF31467C8C24" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" + "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -3046,6 +3076,18 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_A1336C0121F3132E09400329ACD12B30" "MsmSig" = "8:_UNDEFINED" } @@ -3058,6 +3100,18 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_00AB5F4CB0B9DCC466359F8589533B68" "MsmSig" = "8:_UNDEFINED" } @@ -3292,6 +3346,18 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_ED524252AD28281FAE5468349D0E5797" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_BF01A029E83A968C697506DFA469C90B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_55D25B13F818972AA7BF22C7264EBB19" "MsmSig" = "8:_UNDEFINED" } @@ -3328,12 +3394,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_173C4B05CE04BA34E920DC64B25A8670" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } @@ -3645,7 +3705,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:..\\..\\Build\\Debug\\Installers\\Machine Studio Installer Debug.msi" + "OutputFilename" = "8:..\\..\\Build\\Installers\\Machine Studio\\Debug\\Machine Studio Installer v1.0.0.5.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -3677,7 +3737,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:..\\..\\Build\\Release\\Installers\\Machine Studio Installer v1.0.0.5.msi" + "OutputFilename" = "8:..\\..\\Build\\Installers\\Machine Studio\\Release\\Machine Studio Installer v1.0.0.5.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -3739,11 +3799,6 @@ "AssemblyAsmDisplayName" = "8:RazorEngine, Version=3.10.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_00AB5F4CB0B9DCC466359F8589533B68" - { - "Name" = "8:RazorEngine.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:RazorEngine.dll" "TargetName" = "8:" @@ -3856,14 +3911,14 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_05172E77A1E7C13177BE598549F8BD8D" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_059A6746A8576493957C8E5AF3CEB9D9" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Common, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Common, Version=2.0.23.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_05172E77A1E7C13177BE598549F8BD8D" + "_059A6746A8576493957C8E5AF3CEB9D9" { "Name" = "8:Tango.MachineStudio.Common.dll" "Attributes" = "3:512" @@ -3980,20 +4035,15 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0F87989D267539411500CFE68C908375" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0D2EC478B8B5A060121B647E6BA3DE05" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Technician, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Core, Version=2.0.26.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_0F87989D267539411500CFE68C908375" - { - "Name" = "8:Tango.MachineStudio.Technician.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:Tango.MachineStudio.Technician.dll" + "SourcePath" = "8:Tango.Core.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4011,20 +4061,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_13803D82858878E2D3953D4742A1A596" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0E196D84800B9656BC318F85626EFE05" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Collections.Concurrent, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.MachineDesigner, Version=2.0.8.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_13803D82858878E2D3953D4742A1A596" + "_0E196D84800B9656BC318F85626EFE05" { - "Name" = "8:System.Collections.Concurrent.dll" + "Name" = "8:Tango.MachineStudio.MachineDesigner.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Collections.Concurrent.dll" + "SourcePath" = "8:Tango.MachineStudio.MachineDesigner.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4042,26 +4092,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_14CF2DBBA5462C65F94A9137DCE014F9" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_13428C81458C52275C0A41D014521151" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Serialization.Xml, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.UsersAndRoles, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_14CF2DBBA5462C65F94A9137DCE014F9" + "_13428C81458C52275C0A41D014521151" { - "Name" = "8:System.Runtime.Serialization.Xml.dll" - "Attributes" = "3:0" + "Name" = "8:Tango.MachineStudio.UsersAndRoles.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Runtime.Serialization.Xml.dll" + "SourcePath" = "8:Tango.MachineStudio.UsersAndRoles.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -4069,24 +4119,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_15BB153128057B0BB99B99FFB6A1610A" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_13803D82858878E2D3953D4742A1A596" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.BL, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Collections.Concurrent, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_15BB153128057B0BB99B99FFB6A1610A" + "_13803D82858878E2D3953D4742A1A596" { - "Name" = "8:Tango.BL.dll" + "Name" = "8:System.Collections.Concurrent.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.BL.dll" + "SourcePath" = "8:System.Collections.Concurrent.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4104,26 +4154,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_173C4B05CE04BA34E920DC64B25A8670" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_14CF2DBBA5462C65F94A9137DCE014F9" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Xml.ReaderWriter, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:System.Runtime.Serialization.Xml, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_173C4B05CE04BA34E920DC64B25A8670" + "_14CF2DBBA5462C65F94A9137DCE014F9" { - "Name" = "8:System.Xml.ReaderWriter.dll" - "Attributes" = "3:512" + "Name" = "8:System.Runtime.Serialization.Xml.dll" + "Attributes" = "3:0" } } - "SourcePath" = "8:System.Xml.ReaderWriter.dll" + "SourcePath" = "8:System.Runtime.Serialization.Xml.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" + "Vital" = "11:FALSE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -4131,24 +4181,19 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_17BFDCA42AB1DE7706418C4C953F856E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_173C4B05CE04BA34E920DC64B25A8670" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Services.Client.Interactive, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Xml.ReaderWriter, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_17BFDCA42AB1DE7706418C4C953F856E" - { - "Name" = "8:Microsoft.VisualStudio.Services.Client.Interactive.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:Microsoft.VisualStudio.Services.Client.Interactive.dll" + "SourcePath" = "8:System.Xml.ReaderWriter.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4166,20 +4211,15 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1910D5B276479C48B4F7762A638405F5" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_17BFDCA42AB1DE7706418C4C953F856E" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Services.Client.Interactive, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_1910D5B276479C48B4F7762A638405F5" - { - "Name" = "8:System.Runtime.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:System.Runtime.dll" + "SourcePath" = "8:Microsoft.VisualStudio.Services.Client.Interactive.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4197,20 +4237,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1AC47588060EAA9F2B7A13EC07359D10" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1910D5B276479C48B4F7762A638405F5" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Threading, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_1AC47588060EAA9F2B7A13EC07359D10" + "_1910D5B276479C48B4F7762A638405F5" { - "Name" = "8:System.Threading.dll" + "Name" = "8:System.Runtime.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Threading.dll" + "SourcePath" = "8:System.Runtime.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4228,20 +4268,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1BDA3B7B2EF85A48708A41568E05F63F" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1AB2D4983FA9742736ECF3B7F206F2F2" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Serialization.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Synchronization, Version=2.0.9.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_1BDA3B7B2EF85A48708A41568E05F63F" + "_1AB2D4983FA9742736ECF3B7F206F2F2" { - "Name" = "8:System.Runtime.Serialization.Primitives.dll" + "Name" = "8:Tango.MachineStudio.Synchronization.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Runtime.Serialization.Primitives.dll" + "SourcePath" = "8:Tango.MachineStudio.Synchronization.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4259,20 +4299,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1D6707E8224A79E8681FCB390AE53B73" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1AC47588060EAA9F2B7A13EC07359D10" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Serialization, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:System.Threading, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_1D6707E8224A79E8681FCB390AE53B73" + "_1AC47588060EAA9F2B7A13EC07359D10" { - "Name" = "8:Tango.Serialization.dll" + "Name" = "8:System.Threading.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.Serialization.dll" + "SourcePath" = "8:System.Threading.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4290,20 +4330,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_201B65B789181625CAF1E7D925466231" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1BDA3B7B2EF85A48708A41568E05F63F" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.108.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:System.Runtime.Serialization.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_201B65B789181625CAF1E7D925466231" + "_1BDA3B7B2EF85A48708A41568E05F63F" { - "Name" = "8:System.Data.SQLite.dll" + "Name" = "8:System.Runtime.Serialization.Primitives.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Data.SQLite.dll" + "SourcePath" = "8:System.Runtime.Serialization.Primitives.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4321,20 +4361,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_213B2D91506C177B03F29F3DEA02D77C" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_201B65B789181625CAF1E7D925466231" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:WpfAnimatedGif, Version=1.4.14.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.108.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" "ScatterAssemblies" { - "_213B2D91506C177B03F29F3DEA02D77C" + "_201B65B789181625CAF1E7D925466231" { - "Name" = "8:WpfAnimatedGif.dll" + "Name" = "8:System.Data.SQLite.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:WpfAnimatedGif.dll" + "SourcePath" = "8:System.Data.SQLite.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4352,20 +4392,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_21E475E8F9DBB207476AD595250634BF" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2423100AF29217C4332A90074E54D4D0" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:RealTimeGraphEx, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.HardwareDesigner, Version=2.0.8.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_21E475E8F9DBB207476AD595250634BF" + "_2423100AF29217C4332A90074E54D4D0" { - "Name" = "8:RealTimeGraphEx.dll" + "Name" = "8:Tango.MachineStudio.HardwareDesigner.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:RealTimeGraphEx.dll" + "SourcePath" = "8:Tango.MachineStudio.HardwareDesigner.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4483,11 +4523,6 @@ "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_262CDE6547BE15C0065FC563C76194D2" - { - "Name" = "8:Microsoft.TeamFoundation.Common.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Microsoft.TeamFoundation.Common.dll" "TargetName" = "8:" @@ -4569,113 +4604,15 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2A73E80FAA6901CB87461336862D4FDB" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Core, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_2A73E80FAA6901CB87461336862D4FDB" - { - "Name" = "8:Tango.Core.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.Core.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2A89CEAD3955B34E5DD360E38A7B88D8" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.UsersAndRoles, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_2A89CEAD3955B34E5DD360E38A7B88D8" - { - "Name" = "8:Tango.MachineStudio.UsersAndRoles.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.UsersAndRoles.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2BD84519E06924727E32B6E35D589702" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.DAL.Remote, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_2BD84519E06924727E32B6E35D589702" - { - "Name" = "8:Tango.DAL.Remote.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.DAL.Remote.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2C9FFB26D0FA55FA14045BC3DAC4810A" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2EB48F8299C56A3911017460C55FDA43" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.SharedUI, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.ServiceBus, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { - "_2C9FFB26D0FA55FA14045BC3DAC4810A" - { - "Name" = "8:Tango.SharedUI.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:Tango.SharedUI.dll" + "SourcePath" = "8:Microsoft.ServiceBus.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4693,20 +4630,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2EB48F8299C56A3911017460C55FDA43" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2ED45DA7AF8B8894A38769DFF94F274F" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.ServiceBus, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Developer, Version=2.0.15.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_2EB48F8299C56A3911017460C55FDA43" + "_2ED45DA7AF8B8894A38769DFF94F274F" { - "Name" = "8:Microsoft.ServiceBus.dll" + "Name" = "8:Tango.MachineStudio.Developer.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Microsoft.ServiceBus.dll" + "SourcePath" = "8:Tango.MachineStudio.Developer.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4724,20 +4661,15 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2F39762669C91D7ACA3DA752FF966F0F" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2F23291F311EE9576449E5628A5702AE" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.DataCapture, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Transport, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_2F39762669C91D7ACA3DA752FF966F0F" - { - "Name" = "8:Tango.MachineStudio.DataCapture.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:Tango.MachineStudio.DataCapture.dll" + "SourcePath" = "8:Tango.Transport.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4786,26 +4718,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_314EDD4023EE398834106084EB82B617" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_359F09B8EC59D6FC1859EFF3D2274920" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.TFS, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_314EDD4023EE398834106084EB82B617" + "_359F09B8EC59D6FC1859EFF3D2274920" { - "Name" = "8:Tango.TFS.dll" - "Attributes" = "3:512" + "Name" = "8:System.Threading.Tasks.Parallel.dll" + "Attributes" = "3:0" } } - "SourcePath" = "8:Tango.TFS.dll" + "SourcePath" = "8:System.Threading.Tasks.Parallel.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" + "Vital" = "11:FALSE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -4813,30 +4745,30 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_359F09B8EC59D6FC1859EFF3D2274920" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_382ADCBEA6FF11871606FD406333761E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Updater, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_359F09B8EC59D6FC1859EFF3D2274920" + "_382ADCBEA6FF11871606FD406333761E" { - "Name" = "8:System.Threading.Tasks.Parallel.dll" - "Attributes" = "3:0" + "Name" = "8:Tango.MachineStudio.Updater.exe" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Threading.Tasks.Parallel.dll" + "SourcePath" = "8:Tango.MachineStudio.Updater.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -4844,24 +4776,19 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_39427B3257052BFADD6E291BC06EDDBB" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_38A402C026B59AE31D2CBB0235AF3368" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Logging, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.DAL.Remote, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_39427B3257052BFADD6E291BC06EDDBB" - { - "Name" = "8:Tango.Logging.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:Tango.Logging.dll" + "SourcePath" = "8:Tango.DAL.Remote.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -4917,11 +4844,6 @@ "AssemblyAsmDisplayName" = "8:System.IdentityModel.Tokens.Jwt, Version=4.0.20622.1351, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { - "_39DD938A5F3E194F296D11EA2F72EB3E" - { - "Name" = "8:System.IdentityModel.Tokens.Jwt.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.IdentityModel.Tokens.Jwt.dll" "TargetName" = "8:" @@ -5003,37 +4925,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3CB3468A9D276D6877D2AEBE41A9D67C" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Stubs, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_3CB3468A9D276D6877D2AEBE41A9D67C" - { - "Name" = "8:Tango.Stubs.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.Stubs.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3E6534AA37C9012ED3BDF4DCB02EFDB6" { "AssemblyRegister" = "3:1" @@ -5096,20 +4987,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_43CFBD6EDF110CDEE3F67BDBFC3896C5" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4446241C89A5162FB80809A05F581472" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.ColorLab, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.DataCapture, Version=2.0.8.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_43CFBD6EDF110CDEE3F67BDBFC3896C5" + "_4446241C89A5162FB80809A05F581472" { - "Name" = "8:Tango.MachineStudio.ColorLab.dll" + "Name" = "8:Tango.MachineStudio.DataCapture.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.MachineStudio.ColorLab.dll" + "SourcePath" = "8:Tango.MachineStudio.DataCapture.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5134,11 +5025,6 @@ "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Work.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_448950FC944968D96107991185C22806" - { - "Name" = "8:Microsoft.TeamFoundation.Work.WebApi.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Microsoft.TeamFoundation.Work.WebApi.dll" "TargetName" = "8:" @@ -5220,20 +5106,51 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_492411C750E878FDDEC853B5BD1B42A4" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_47ECF1DA52157B12F544FB237D85F564" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Updater, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Logging, Version=2.0.15.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_492411C750E878FDDEC853B5BD1B42A4" + "_47ECF1DA52157B12F544FB237D85F564" { - "Name" = "8:Tango.MachineStudio.Updater.exe" + "Name" = "8:Tango.MachineStudio.Logging.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.MachineStudio.Updater.exe" + "SourcePath" = "8:Tango.MachineStudio.Logging.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C15E39669002469F98F297C08D55903C" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4A177C28F7864675BCA7A0910494A760" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Tango.Visuals, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_4A177C28F7864675BCA7A0910494A760" + { + "Name" = "8:Tango.Visuals.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Tango.Visuals.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5289,11 +5206,6 @@ "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Services.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_4DE31F37261519B6E72F89F737E10A45" - { - "Name" = "8:Microsoft.VisualStudio.Services.WebApi.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Microsoft.VisualStudio.Services.WebApi.dll" "TargetName" = "8:" @@ -5468,26 +5380,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_52F0C34C64530B37BEE83F9DE86EB59A" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_55D25B13F818972AA7BF22C7264EBB19" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Editors, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_52F0C34C64530B37BEE83F9DE86EB59A" + "_55D25B13F818972AA7BF22C7264EBB19" { - "Name" = "8:Tango.Editors.dll" - "Attributes" = "3:512" + "Name" = "8:System.Windows.dll" + "Attributes" = "3:0" } } - "SourcePath" = "8:Tango.Editors.dll" + "SourcePath" = "8:System.Windows.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" + "Vital" = "11:FALSE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -5495,24 +5407,19 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_53F62E6A8312202486ED187D9643BAF5" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_56D463E782DDBEB9880013C0D31F3C99" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Settings, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Client, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_53F62E6A8312202486ED187D9643BAF5" - { - "Name" = "8:Tango.Settings.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:Tango.Settings.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.Client.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5530,26 +5437,15 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_55D25B13F818972AA7BF22C7264EBB19" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5747A410B7984793A0F6D9121679C6F3" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_55D25B13F818972AA7BF22C7264EBB19" - { - "Name" = "8:System.Windows.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Windows.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\..\\Build\\Debug\\x86\\SQLite.Interop.dll" + "TargetName" = "8:SQLite.Interop.dll" "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" + "Folder" = "8:_137C662BA6B24073AC58ED6C67DA7951" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -5557,24 +5453,19 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_56D463E782DDBEB9880013C0D31F3C99" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5A8B326A4A0607AFC366F8FD9657A87A" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Client, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.SharedUI, Version=2.0.24.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_56D463E782DDBEB9880013C0D31F3C99" - { - "Name" = "8:Microsoft.TeamFoundation.Client.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:Microsoft.TeamFoundation.Client.dll" + "SourcePath" = "8:Tango.SharedUI.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5592,12 +5483,23 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5747A410B7984793A0F6D9121679C6F3" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5BB4E116AC988395D2A72901433A7CB9" { - "SourcePath" = "8:..\\..\\Build\\Debug\\x86\\SQLite.Interop.dll" - "TargetName" = "8:SQLite.Interop.dll" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Tango.BrushPicker, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_5BB4E116AC988395D2A72901433A7CB9" + { + "Name" = "8:Tango.BrushPicker.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Tango.BrushPicker.dll" + "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_137C662BA6B24073AC58ED6C67DA7951" + "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -5609,23 +5511,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_59D813DF37D45AD32E6BAE90E915CF12" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5C5582DB321E2CC26F8F1FBF8B4866F0" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Developer, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.IO, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_59D813DF37D45AD32E6BAE90E915CF12" + "_5C5582DB321E2CC26F8F1FBF8B4866F0" { - "Name" = "8:Tango.MachineStudio.Developer.dll" + "Name" = "8:System.IO.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.MachineStudio.Developer.dll" + "SourcePath" = "8:System.IO.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5643,20 +5545,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5C5582DB321E2CC26F8F1FBF8B4866F0" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5C9E5FF7D356A4422B8968FB61BDF478" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.IO, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.Synchronization, Version=2.0.14.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_5C5582DB321E2CC26F8F1FBF8B4866F0" + "_5C9E5FF7D356A4422B8968FB61BDF478" { - "Name" = "8:System.IO.dll" + "Name" = "8:Tango.Synchronization.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.IO.dll" + "SourcePath" = "8:Tango.Synchronization.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5681,11 +5583,6 @@ "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" "ScatterAssemblies" { - "_5D31D40A55F64C363A1DE193E24D604B" - { - "Name" = "8:Newtonsoft.Json.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Newtonsoft.Json.dll" "TargetName" = "8:" @@ -5736,6 +5633,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_61ACBC61C06E40FB3AE4346599718EB4" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.ColorLab, Version=2.0.8.1633, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_61ACBC61C06E40FB3AE4346599718EB4" + { + "Name" = "8:Tango.MachineStudio.ColorLab.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Tango.MachineStudio.ColorLab.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C15E39669002469F98F297C08D55903C" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_62EC6F0F04E5435ABCC0479D48BEBE1B" { "AssemblyRegister" = "3:1" @@ -5774,11 +5702,6 @@ "AssemblyAsmDisplayName" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.13.5.907, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { - "_633F9949B09BE13FCEC5B9CE99D81421" - { - "Name" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" "TargetName" = "8:" @@ -5798,20 +5721,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_637D6BEFFCB850675DD5A053B16A90CC" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_64AD2A918B16AA625B839A6A2D4288AB" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Synchronization, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" "ScatterAssemblies" { - "_637D6BEFFCB850675DD5A053B16A90CC" + "_64AD2A918B16AA625B839A6A2D4288AB" { - "Name" = "8:Tango.Synchronization.dll" + "Name" = "8:System.Reactive.Interfaces.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.Synchronization.dll" + "SourcePath" = "8:System.Reactive.Interfaces.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5829,20 +5752,15 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_64AD2A918B16AA625B839A6A2D4288AB" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_67EAE4B6E14417FC2BF4F4EBF4473A1E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.DragAndDrop, Version=2.0.23.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_64AD2A918B16AA625B839A6A2D4288AB" - { - "Name" = "8:System.Reactive.Interfaces.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:System.Reactive.Interfaces.dll" + "SourcePath" = "8:Tango.DragAndDrop.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5860,20 +5778,15 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6C905EAE2E8F3F1F9F11F2E1A1B5B79D" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_69CC8DD07F81DD7EA883434F53157FBC" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.DAL.Local, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Serialization, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_6C905EAE2E8F3F1F9F11F2E1A1B5B79D" - { - "Name" = "8:Tango.DAL.Local.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:Tango.DAL.Local.dll" + "SourcePath" = "8:Tango.Serialization.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5891,20 +5804,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6D9156D5DBF08959BE20FE18FA09E71A" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6AE2958999F8B1E88D8475CB3E791CF2" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Extensions, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:WpfAnimatedGif, Version=1.4.14.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_6D9156D5DBF08959BE20FE18FA09E71A" + "_6AE2958999F8B1E88D8475CB3E791CF2" { - "Name" = "8:System.Runtime.Extensions.dll" + "Name" = "8:WpfAnimatedGif.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Runtime.Extensions.dll" + "SourcePath" = "8:WpfAnimatedGif.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5922,20 +5835,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6D9156D5DBF08959BE20FE18FA09E71A" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Runtime.Extensions, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_6E2E48228E9ADAD05ABEFB8E7A69DCCC" + "_6D9156D5DBF08959BE20FE18FA09E71A" { - "Name" = "8:Microsoft.TeamFoundation.WorkItemTracking.Common.dll" + "Name" = "8:System.Runtime.Extensions.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Common.dll" + "SourcePath" = "8:System.Runtime.Extensions.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5953,20 +5866,15 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6F9B747A4443266580CBCA4DBC2AFCA9" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Scripting, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_6F9B747A4443266580CBCA4DBC2AFCA9" - { - "Name" = "8:Tango.Scripting.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:Tango.Scripting.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Common.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6108,6 +6016,32 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_75D29198D3E03B5554EF1C7382CF5B14" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Tango.Integration, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + } + "SourcePath" = "8:Tango.Integration.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C15E39669002469F98F297C08D55903C" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_75EE66E420D1D88C8A6F9FAC15995211" { "AssemblyRegister" = "3:1" @@ -6115,11 +6049,6 @@ "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Core.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_75EE66E420D1D88C8A6F9FAC15995211" - { - "Name" = "8:Microsoft.TeamFoundation.Core.WebApi.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Microsoft.TeamFoundation.Core.WebApi.dll" "TargetName" = "8:" @@ -6139,20 +6068,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7E765F76FDFC3DCF4EAEB59B5546B063" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7745EEBA3C6F32DA91434BF623E143C5" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Stubs, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_7E765F76FDFC3DCF4EAEB59B5546B063" + "_7745EEBA3C6F32DA91434BF623E143C5" { - "Name" = "8:MaterialDesignColors.dll" + "Name" = "8:Tango.MachineStudio.Stubs.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:MaterialDesignColors.dll" + "SourcePath" = "8:Tango.MachineStudio.Stubs.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6170,20 +6099,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_847DE93907D7F6B17C0694F74120086B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7A0D754929705CC64EF84E26BD75D642" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:RealTimeGraphEx, Version=1.0.17.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_847DE93907D7F6B17C0694F74120086B" + "_7A0D754929705CC64EF84E26BD75D642" { - "Name" = "8:FontAwesome.WPF.dll" + "Name" = "8:RealTimeGraphEx.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:FontAwesome.WPF.dll" + "SourcePath" = "8:RealTimeGraphEx.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6201,20 +6130,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_86870D3B7B8EDDEE5AC5CA6E385C1CC6" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7E765F76FDFC3DCF4EAEB59B5546B063" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.DB, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_86870D3B7B8EDDEE5AC5CA6E385C1CC6" + "_7E765F76FDFC3DCF4EAEB59B5546B063" { - "Name" = "8:Tango.MachineStudio.DB.dll" + "Name" = "8:MaterialDesignColors.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.MachineStudio.DB.dll" + "SourcePath" = "8:MaterialDesignColors.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6232,20 +6161,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_877DF22E1E92563A6F4E77209D76B185" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7F2A242EE11515CC12A6793521574B9B" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Xml.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Tango.EmbroideryUI, Version=1.0.5.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_877DF22E1E92563A6F4E77209D76B185" + "_7F2A242EE11515CC12A6793521574B9B" { - "Name" = "8:System.Xml.XDocument.dll" + "Name" = "8:Tango.EmbroideryUI.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Xml.XDocument.dll" + "SourcePath" = "8:Tango.EmbroideryUI.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6263,26 +6192,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_896E731F0FFC039A04E0A4482B3FED1F" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_847DE93907D7F6B17C0694F74120086B" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.WebHeaderCollection, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL" "ScatterAssemblies" { - "_896E731F0FFC039A04E0A4482B3FED1F" + "_847DE93907D7F6B17C0694F74120086B" { - "Name" = "8:System.Net.WebHeaderCollection.dll" - "Attributes" = "3:0" + "Name" = "8:FontAwesome.WPF.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Net.WebHeaderCollection.dll" + "SourcePath" = "8:FontAwesome.WPF.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -6290,24 +6219,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_89F5A3B2E6E527F5F7B84DBCACA1BC6A" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_877DF22E1E92563A6F4E77209D76B185" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.DragAndDrop, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:System.Xml.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_89F5A3B2E6E527F5F7B84DBCACA1BC6A" + "_877DF22E1E92563A6F4E77209D76B185" { - "Name" = "8:Tango.DragAndDrop.dll" + "Name" = "8:System.Xml.XDocument.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.DragAndDrop.dll" + "SourcePath" = "8:System.Xml.XDocument.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6325,26 +6254,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8A9518734ED9FAF2C17EC05C0C348448" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_896E731F0FFC039A04E0A4482B3FED1F" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Stubs, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Net.WebHeaderCollection, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_8A9518734ED9FAF2C17EC05C0C348448" + "_896E731F0FFC039A04E0A4482B3FED1F" { - "Name" = "8:Tango.MachineStudio.Stubs.dll" - "Attributes" = "3:512" + "Name" = "8:System.Net.WebHeaderCollection.dll" + "Attributes" = "3:0" } } - "SourcePath" = "8:Tango.MachineStudio.Stubs.dll" + "SourcePath" = "8:System.Net.WebHeaderCollection.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" + "Vital" = "11:FALSE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -6352,7 +6281,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -6425,11 +6354,6 @@ "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_922DFCAF3DE2758155669B16C5E04B95" - { - "Name" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.dll" "TargetName" = "8:" @@ -6480,18 +6404,13 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9313675002CAB896AA36284B33284921" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_94B0EAFC6BCADB7C6DC2EF31467C8C24" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.CodeGeneration, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.CodeGeneration, Version=2.0.14.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_9313675002CAB896AA36284B33284921" - { - "Name" = "8:Tango.CodeGeneration.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.CodeGeneration.dll" "TargetName" = "8:" @@ -6511,20 +6430,15 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_94F728AD3014EE7BB551FB6A29DC0705" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_95A39C4C0476DF1F27B60A43C00DEAB7" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Video, Version=1.0.0.1, Culture=neutral, processorArchitecture=x86" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_94F728AD3014EE7BB551FB6A29DC0705" - { - "Name" = "8:Tango.Video.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:Tango.Video.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6542,26 +6456,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_95A39C4C0476DF1F27B60A43C00DEAB7" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_967E9E20CB6B9C494DFC2637B6384B13" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Reflection.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_95A39C4C0476DF1F27B60A43C00DEAB7" + "_967E9E20CB6B9C494DFC2637B6384B13" { - "Name" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll" - "Attributes" = "3:512" + "Name" = "8:System.Reflection.Extensions.dll" + "Attributes" = "3:0" } } - "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll" + "SourcePath" = "8:System.Reflection.Extensions.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" + "Vital" = "11:FALSE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -6569,30 +6483,25 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_967E9E20CB6B9C494DFC2637B6384B13" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9758638AABE50C72FFA87E6544F6D70F" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reflection.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.Settings, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_967E9E20CB6B9C494DFC2637B6384B13" - { - "Name" = "8:System.Reflection.Extensions.dll" - "Attributes" = "3:0" - } } - "SourcePath" = "8:System.Reflection.Extensions.dll" + "SourcePath" = "8:Tango.Settings.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -6600,7 +6509,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -6673,11 +6582,6 @@ "AssemblyAsmDisplayName" = "8:System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { - "_99DE0EEEA77B1C8F35CBE84DD3C935C4" - { - "Name" = "8:System.Net.Http.Formatting.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Net.Http.Formatting.dll" "TargetName" = "8:" @@ -6697,37 +6601,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9A234F7FB4239AC3DB0DBE9415BDE695" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.AutoComplete, Version=1.0.0.8, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_9A234F7FB4239AC3DB0DBE9415BDE695" - { - "Name" = "8:Tango.AutoComplete.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.AutoComplete.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9CCA52D51EEDBFE9F9794A8ACD30D5D9" { "AssemblyRegister" = "3:1" @@ -6759,37 +6632,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9E660063B542815E08A7C12DF8A34878" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Logging, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_9E660063B542815E08A7C12DF8A34878" - { - "Name" = "8:Tango.MachineStudio.Logging.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.Logging.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A0C8023CFDF8E1966A878020945346CF" { "AssemblyRegister" = "3:1" @@ -6945,37 +6787,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AAC651516A7389ACE7743F8E6CF6D9AB" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.HardwareDesigner, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_AAC651516A7389ACE7743F8E6CF6D9AB" - { - "Name" = "8:Tango.MachineStudio.HardwareDesigner.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.HardwareDesigner.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AB0E0C1990036EFBAC9C728A9902D668" { "AssemblyRegister" = "3:1" @@ -7100,20 +6911,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B20313AE68F1E5D38CDE24036C32E69B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B12544C6B013F48780D190EB513A3B82" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.Http.WebRequest, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.ColorPicker, Version=2.0.17.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_B20313AE68F1E5D38CDE24036C32E69B" + "_B12544C6B013F48780D190EB513A3B82" { - "Name" = "8:System.Net.Http.WebRequest.dll" + "Name" = "8:Tango.ColorPicker.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Net.Http.WebRequest.dll" + "SourcePath" = "8:Tango.ColorPicker.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7131,20 +6942,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B3A8AA44D6059DC53E41A988FDE4416F" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B20313AE68F1E5D38CDE24036C32E69B" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Synchronization, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Net.Http.WebRequest, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_B3A8AA44D6059DC53E41A988FDE4416F" + "_B20313AE68F1E5D38CDE24036C32E69B" { - "Name" = "8:Tango.MachineStudio.Synchronization.dll" + "Name" = "8:System.Net.Http.WebRequest.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.MachineStudio.Synchronization.dll" + "SourcePath" = "8:System.Net.Http.WebRequest.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7169,11 +6980,6 @@ "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_B78AD04F5CD695E22F6F139EAC69B5A5" - { - "Name" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll" "TargetName" = "8:" @@ -7231,13 +7037,65 @@ "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Diff, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_BA22D23CB5304B5389C531581B1D5C63" + } + "SourcePath" = "8:Microsoft.TeamFoundation.Diff.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C15E39669002469F98F297C08D55903C" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Tango.AutoComplete, Version=1.0.17.1633, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_BDEEC0B558BD7D7AF03CB6049BCEBDAC" { - "Name" = "8:Microsoft.TeamFoundation.Diff.dll" + "Name" = "8:Tango.AutoComplete.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Microsoft.TeamFoundation.Diff.dll" + "SourcePath" = "8:Tango.AutoComplete.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C15E39669002469F98F297C08D55903C" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BF01A029E83A968C697506DFA469C90B" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:ColorMine, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + } + "SourcePath" = "8:ColorMine.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7286,20 +7144,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C6BFB4DAD78C1798616508141EF1234E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C5718F2557E2B4CE76D02A14D19B0F00" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Threading.Tasks, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Technician, Version=2.0.12.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_C6BFB4DAD78C1798616508141EF1234E" + "_C5718F2557E2B4CE76D02A14D19B0F00" { - "Name" = "8:System.Threading.Tasks.dll" + "Name" = "8:Tango.MachineStudio.Technician.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Threading.Tasks.dll" + "SourcePath" = "8:Tango.MachineStudio.Technician.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7317,20 +7175,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CB98D848FEE26D0BA1F4ED92E5D4F727" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C658BF7DEB725E94A2BAF4FD48BAD3FA" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Integration, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.CSV, Version=2.0.17.1657, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_CB98D848FEE26D0BA1F4ED92E5D4F727" + "_C658BF7DEB725E94A2BAF4FD48BAD3FA" { - "Name" = "8:Tango.Integration.dll" + "Name" = "8:Tango.CSV.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.Integration.dll" + "SourcePath" = "8:Tango.CSV.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7348,26 +7206,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CC07BBC3C44CE424AA0EF90844590E4E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C6BFB4DAD78C1798616508141EF1234E" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Resources.ResourceManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:System.Threading.Tasks, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_CC07BBC3C44CE424AA0EF90844590E4E" + "_C6BFB4DAD78C1798616508141EF1234E" { - "Name" = "8:System.Resources.ResourceManager.dll" - "Attributes" = "3:0" + "Name" = "8:System.Threading.Tasks.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Resources.ResourceManager.dll" + "SourcePath" = "8:System.Threading.Tasks.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7375,24 +7233,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CC7BD04781686DE3403908303698199D" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CC07BBC3C44CE424AA0EF90844590E4E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Linq.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:System.Resources.ResourceManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_CC7BD04781686DE3403908303698199D" + "_CC07BBC3C44CE424AA0EF90844590E4E" { - "Name" = "8:System.Linq.Parallel.dll" + "Name" = "8:System.Resources.ResourceManager.dll" "Attributes" = "3:0" } } - "SourcePath" = "8:System.Linq.Parallel.dll" + "SourcePath" = "8:System.Resources.ResourceManager.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7410,26 +7268,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CCD49B330E05F963B5AE73E3D04F5762" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CC7BD04781686DE3403908303698199D" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.Primitives, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:System.Linq.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_CCD49B330E05F963B5AE73E3D04F5762" + "_CC7BD04781686DE3403908303698199D" { - "Name" = "8:System.Net.Primitives.dll" - "Attributes" = "3:512" + "Name" = "8:System.Linq.Parallel.dll" + "Attributes" = "3:0" } } - "SourcePath" = "8:System.Net.Primitives.dll" + "SourcePath" = "8:System.Linq.Parallel.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" + "Vital" = "11:FALSE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7437,24 +7295,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CF21DC4ED06B5E41D3B7A39D1820BDBE" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CCD49B330E05F963B5AE73E3D04F5762" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Visuals, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Net.Primitives, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_CF21DC4ED06B5E41D3B7A39D1820BDBE" + "_CCD49B330E05F963B5AE73E3D04F5762" { - "Name" = "8:Tango.Visuals.dll" + "Name" = "8:System.Net.Primitives.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.Visuals.dll" + "SourcePath" = "8:System.Net.Primitives.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7510,11 +7368,6 @@ "AssemblyAsmDisplayName" = "8:System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D0CFB25F1239503E9FE3881A033B3110" - { - "Name" = "8:System.Web.Razor.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Web.Razor.dll" "TargetName" = "8:" @@ -7565,20 +7418,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D2CFC127042C0E0688E8BD6ACF778EBC" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D3EF38D40E0CBE1BD391303952B0493E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.PMR, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Xml.XDocument, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_D2CFC127042C0E0688E8BD6ACF778EBC" + "_D3EF38D40E0CBE1BD391303952B0493E" { - "Name" = "8:Tango.PMR.dll" + "Name" = "8:System.Xml.XDocument.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.PMR.dll" + "SourcePath" = "8:System.Xml.XDocument.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7596,26 +7449,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D3E47EC14F8EA2965223A27D1918A672" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D48D475C8BD232C2AC87A2A7C6CCA53D" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.ColorPicker, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Security.Principal, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_D3E47EC14F8EA2965223A27D1918A672" + "_D48D475C8BD232C2AC87A2A7C6CCA53D" { - "Name" = "8:Tango.ColorPicker.dll" - "Attributes" = "3:512" + "Name" = "8:System.Security.Principal.dll" + "Attributes" = "3:0" } } - "SourcePath" = "8:Tango.ColorPicker.dll" + "SourcePath" = "8:System.Security.Principal.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" + "Vital" = "11:FALSE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7623,24 +7476,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D3EF38D40E0CBE1BD391303952B0493E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D528F21311ECF12D91A0EFF0F8DCA468" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Xml.XDocument, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.Stubs, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D3EF38D40E0CBE1BD391303952B0493E" + "_D528F21311ECF12D91A0EFF0F8DCA468" { - "Name" = "8:System.Xml.XDocument.dll" + "Name" = "8:Tango.Stubs.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Xml.XDocument.dll" + "SourcePath" = "8:Tango.Stubs.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7658,20 +7511,15 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D470E365B719E131A541EC96D73484A0" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.EmbroideryUI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D470E365B719E131A541EC96D73484A0" - { - "Name" = "8:Tango.EmbroideryUI.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:Tango.EmbroideryUI.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7689,51 +7537,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D48D475C8BD232C2AC87A2A7C6CCA53D" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Security.Principal, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_D48D475C8BD232C2AC87A2A7C6CCA53D" - { - "Name" = "8:System.Security.Principal.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Security.Principal.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D6A37AFBBBDA445164B68F2E7D5B3E80" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Editors, Version=2.0.17.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "_D6A37AFBBBDA445164B68F2E7D5B3E80" { - "Name" = "8:Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll" + "Name" = "8:Tango.Editors.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll" + "SourcePath" = "8:Tango.Editors.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7820,11 +7637,6 @@ "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Proxy, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D949D70DDDDCF94CDCAD9B76A400C3D3" - { - "Name" = "8:Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll" "TargetName" = "8:" @@ -7844,20 +7656,15 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D9EF522BC47ECC080EE226A759300C15" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DB4941BAFA45E5921E7072990000621E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.BrushPicker, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Logging, Version=2.0.30.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D9EF522BC47ECC080EE226A759300C15" - { - "Name" = "8:Tango.BrushPicker.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:Tango.BrushPicker.dll" + "SourcePath" = "8:Tango.Logging.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7999,26 +7806,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DD39CE828177428F0CEE9385B5645996" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DD77D7B58FFDC37F83D85D632BEC9DC4" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ICSharpCode.AvalonEdit, Version=4.3.1.9429, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Runtime.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_DD39CE828177428F0CEE9385B5645996" + "_DD77D7B58FFDC37F83D85D632BEC9DC4" { - "Name" = "8:ICSharpCode.AvalonEdit.dll" - "Attributes" = "3:512" + "Name" = "8:System.Runtime.Numerics.dll" + "Attributes" = "3:0" } } - "SourcePath" = "8:ICSharpCode.AvalonEdit.dll" + "SourcePath" = "8:System.Runtime.Numerics.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" + "Vital" = "11:FALSE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -8026,30 +7833,30 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DD77D7B58FFDC37F83D85D632BEC9DC4" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DE3FACD5F197D2E261A0C6B32E0D1CAC" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:System.Runtime.Serialization.Primitives, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_DD77D7B58FFDC37F83D85D632BEC9DC4" + "_DE3FACD5F197D2E261A0C6B32E0D1CAC" { - "Name" = "8:System.Runtime.Numerics.dll" - "Attributes" = "3:0" + "Name" = "8:System.Runtime.Serialization.Primitives.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Runtime.Numerics.dll" + "SourcePath" = "8:System.Runtime.Serialization.Primitives.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -8057,24 +7864,19 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DE3FACD5F197D2E261A0C6B32E0D1CAC" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DF6FFF88157E7FBCFB7E188431AAF4CF" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Serialization.Primitives, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.PMR, Version=2.0.33.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_DE3FACD5F197D2E261A0C6B32E0D1CAC" - { - "Name" = "8:System.Runtime.Serialization.Primitives.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:System.Runtime.Serialization.Primitives.dll" + "SourcePath" = "8:Tango.PMR.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8154,20 +7956,41 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E1434CE35073957D38F3151D4DA22954" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E97069A1CAEDE89621181DEE3B97B547" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Services.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "ScatterAssemblies" + { + } + "SourcePath" = "8:Microsoft.VisualStudio.Services.Common.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C15E39669002469F98F297C08D55903C" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E9B6634643306242F65E192204E9C56A" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ColorMine, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.TFS, Version=2.0.17.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_E1434CE35073957D38F3151D4DA22954" - { - "Name" = "8:ColorMine.dll" - "Attributes" = "3:512" - } } - "SourcePath" = "8:ColorMine.dll" + "SourcePath" = "8:Tango.TFS.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8185,20 +8008,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E97069A1CAEDE89621181DEE3B97B547" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EA4D0354739F3915FC03731153325AA5" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Services.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.DAL.Local, Version=2.0.14.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_E97069A1CAEDE89621181DEE3B97B547" + "_EA4D0354739F3915FC03731153325AA5" { - "Name" = "8:Microsoft.VisualStudio.Services.Common.dll" + "Name" = "8:Tango.DAL.Local.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Microsoft.VisualStudio.Services.Common.dll" + "SourcePath" = "8:Tango.DAL.Local.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8216,20 +8039,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E9C7F88E8787ECFBC3D0DDF2CD009F50" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EB16994750C856659A7BE41BD02F8ABE" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Transport, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Video, Version=2.0.17.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_E9C7F88E8787ECFBC3D0DDF2CD009F50" + "_EB16994750C856659A7BE41BD02F8ABE" { - "Name" = "8:Tango.Transport.dll" + "Name" = "8:Tango.Video.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.Transport.dll" + "SourcePath" = "8:Tango.Video.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8340,6 +8163,32 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_ED524252AD28281FAE5468349D0E5797" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:ICSharpCode.AvalonEdit, Version=1.0.18.1933, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + } + "SourcePath" = "8:ICSharpCode.AvalonEdit.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C15E39669002469F98F297C08D55903C" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EF2623DE67EDC70B584821A055B86302" { "AssemblyRegister" = "3:1" @@ -8402,6 +8251,32 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F1DFFB8E50BAD2529B0C859268ED8956" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Tango.Scripting, Version=2.0.23.1633, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + } + "SourcePath" = "8:Tango.Scripting.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C15E39669002469F98F297C08D55903C" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F3898C4F454B4D1481E055F2AB2B217B" { "SourcePath" = "8:..\\..\\Build\\Debug\\x64\\SQLite.Interop.dll" @@ -8522,11 +8397,6 @@ "AssemblyAsmDisplayName" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.13.5.907, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { - "_F93FF260A2F031FD129C02F9FB2A6E9D" - { - "Name" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.dll" "TargetName" = "8:" @@ -8608,20 +8478,46 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FC1610908696F9023D51C2E568128AC2" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FAAE7C62982AB9171B3FF838FB304946" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.MachineDesigner, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.DB, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_FC1610908696F9023D51C2E568128AC2" + "_FAAE7C62982AB9171B3FF838FB304946" { - "Name" = "8:Tango.MachineStudio.MachineDesigner.dll" + "Name" = "8:Tango.MachineStudio.DB.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.MachineStudio.MachineDesigner.dll" + "SourcePath" = "8:Tango.MachineStudio.DB.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C15E39669002469F98F297C08D55903C" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FC7C3735446215F02CF0C477948EAAFC" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Tango.BL, Version=2.0.29.1633, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + } + "SourcePath" = "8:Tango.BL.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -9267,7 +9163,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_136196DD2763419D959721C2BA143498" { - "SourcePath" = "8:..\\Tango.MachineStudio.UI\\obj\\Release\\Tango.MachineStudio.UI.exe" + "SourcePath" = "8:..\\Tango.MachineStudio.UI\\obj\\Debug\\Tango.MachineStudio.UI.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj index cb492a6c4..e86b3ddf0 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj @@ -34,7 +34,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -43,7 +43,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Release\</OutputPath> + <OutputPath>..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index 630a02ee0..724f83680 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -21,7 +21,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -30,7 +30,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Release\</OutputPath> + <OutputPath>..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -491,6 +491,14 @@ <EmbeddedResource Include="..\..\Versioning\ChangeLog.txt"> <Link>ChangeLog.txt</Link> </EmbeddedResource> + <Content Include="..\..\Build\Native\Debug\Tango.ColorLib.dll"> + <Link>Tango.ColorLib.dll</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="..\..\Build\Native\Debug\Tango.Embroidery.dll"> + <Link>Tango.Embroidery.dll</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="Html\HTML Templates\Thread Break.html" /> <Resource Include="machine.ico" /> <Resource Include="Images\bug-resolved.png" /> @@ -506,7 +514,7 @@ </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <PropertyGroup> - <PostBuildEvent>if $(ConfigurationName) == Debug $(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Machine Studio.lnk" + <PostBuildEvent>$(SolutionDir)Build\Utilities\Debug\linkgen.exe -s "$(TargetPath)" -d "$(SolutionDir)Build\Shortcuts\Machine Studio.lnk" RD /S /Q "$(TargetDir)cs\" RD /S /Q "$(TargetDir)da\" @@ -551,7 +559,14 @@ RD /S /Q "$(TargetDir)zh-Hans\" RD /S /Q "$(TargetDir)zh-Hant\" RD /S /Q "$(TargetDir)bg\" RD /S /Q "$(TargetDir)bn-BD\" -RD /S /Q "$(TargetDir)nb-NO\"</PostBuildEvent> +RD /S /Q "$(TargetDir)nb-NO\" +RD /S /Q "$(TargetDir)pt-BR\" + +copy /Y "$(SolutionDir)Referenced Assemblies\mscoree.dll" "$(TargetDir)" +copy /Y "$(SolutionDir)Referenced Assemblies\msvcp140d.dll" "$(TargetDir)" +copy /Y "$(SolutionDir)Referenced Assemblies\ucrtbased.dll" "$(TargetDir)" +copy /Y "$(SolutionDir)Referenced Assemblies\vcruntime140.dll" "$(TargetDir)" +copy /Y "$(SolutionDir)Referenced Assemblies\vcruntime140d.dll" "$(TargetDir)"</PostBuildEvent> </PropertyGroup> <Import Project="..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj index 287103c2e..db6fcb52f 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Machine Studio\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -28,7 +28,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Release\</OutputPath> + <OutputPath>..\..\Build\Machine Studio\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj index b232943d2..6a02e00a1 100644 --- a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj +++ b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj @@ -72,7 +72,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <OutDir>$(SolutionDir)Build\Debug\</OutDir> + <OutDir>$(SolutionDir)Build\Native\Debug</OutDir> <IncludePath>$(ProjectDir);$(IncludePath)</IncludePath> <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild> </PropertyGroup> @@ -81,7 +81,7 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <OutDir>$(SolutionDir)Build\Release\</OutDir> + <OutDir>$(SolutionDir)Build\Native\Release</OutDir> <IncludePath>$(ProjectDir);$(IncludePath)</IncludePath> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -104,7 +104,7 @@ <AssemblyDebug>true</AssemblyDebug> </Link> <PreBuildEvent> - <Command>"$(TargetDir)proto-tc.exe" -i "$(SolutionDir)..\PMR\Messages" -o "$(SolutionDir)Native\Tango.ColorLib\PMR" -l C -c "ColorLab"</Command> + <Command>"$(SolutionDir)Build\Utilities\Debug\proto-tc.exe" -i "$(SolutionDir)..\PMR\Messages" -o "$(SolutionDir)Native\Tango.ColorLib\PMR" -l C -c "ColorLab"</Command> </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> diff --git a/Software/Visual_Studio/Native/Tango.Emulations.Native/Tango.Emulations.Native.vcxproj b/Software/Visual_Studio/Native/Tango.Emulations.Native/Tango.Emulations.Native.vcxproj index cfde88dc6..df4a5a4b6 100644 --- a/Software/Visual_Studio/Native/Tango.Emulations.Native/Tango.Emulations.Native.vcxproj +++ b/Software/Visual_Studio/Native/Tango.Emulations.Native/Tango.Emulations.Native.vcxproj @@ -72,14 +72,14 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <OutDir>$(SolutionDir)Build\Debug\</OutDir> + <OutDir>$(SolutionDir)Build\Native\Debug</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <OutDir>$(SolutionDir)Build\Release\</OutDir> + <OutDir>$(SolutionDir)Build\Native\Release</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> diff --git a/Software/Visual_Studio/Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj b/Software/Visual_Studio/Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj index 06ba06587..09cd3716b 100644 --- a/Software/Visual_Studio/Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj +++ b/Software/Visual_Studio/Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj @@ -71,11 +71,11 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <TargetExt>.dll</TargetExt> - <OutDir>$(SolutionDir)Build\Debug</OutDir> + <OutDir>$(SolutionDir)Build\Native\Debug</OutDir> <IncludePath>$(IncludePath)</IncludePath> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)Build\Release</OutDir> + <OutDir>$(SolutionDir)Build\Native\Release</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj index 67d57ea93..9898ef987 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\PPC\</OutputPath> + <OutputPath>..\..\..\Build\PPC\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\PPC\</OutputPath> + <OutputPath>..\..\..\Build\PPC\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -344,7 +344,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj index ddacc3d9f..3e9635060 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\PPC\</OutputPath> + <OutputPath>..\..\..\Build\PPC\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\PPC\</OutputPath> + <OutputPath>..\..\..\Build\PPC\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -155,7 +155,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj index 257ddf58d..a5e3d9da0 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\Build\Debug\PPC\</OutputPath> + <OutputPath>..\..\..\Build\PPC\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\Build\Release\PPC\</OutputPath> + <OutputPath>..\..\..\Build\PPC\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -155,7 +155,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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.Common/ApplicationStates.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/ApplicationStates.cs index 0679c9f42..7be896b0d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/ApplicationStates.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/ApplicationStates.cs @@ -21,9 +21,9 @@ namespace Tango.PPC.Common /// </summary> SemiSetup = 1, /// <summary> - /// Application should run as normal. + /// Application is ready to run as normal. /// </summary> - Default = 2, + Ready = 2, /// <summary> /// Updater utility should update the application assemblies and start the main application with startup arguments. /// </summary> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj index 1214093b9..d6accf6fd 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj @@ -34,7 +34,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\PPC\</OutputPath> + <OutputPath>..\..\Build\PPC\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -42,7 +42,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> + <OutputPath>..\..\Build\PPC\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -280,7 +280,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher/MainWindow.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Publisher/MainWindow.xaml index 657453e19..d1921b0a8 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher/MainWindow.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher/MainWindow.xaml @@ -2,6 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:examiner="clr-namespace:Tango.SQLExaminer;assembly=Tango.SQLExaminer" @@ -26,6 +27,14 @@ <TextBlock FontSize="22">Tango Publish Utility</TextBlock> <DockPanel Margin="0 40 0 0"> + <TextBlock VerticalAlignment="Center" Width="136" DockPanel.Dock="Left">Build Configuration:</TextBlock> + <ComboBox Margin="20 0 0 0" SelectedItem="{Binding SelectedBuildConfiguration}" SelectedIndex="0"> + <sys:String>Release</sys:String> + <sys:String>Debug</sys:String> + </ComboBox> + </DockPanel> + + <DockPanel Margin="0 20 0 0"> <TextBlock VerticalAlignment="Center" DockPanel.Dock="Left">Selected machine version:</TextBlock> <ComboBox Margin="20 0 0 0" ItemsSource="{Binding MachineVersions}" SelectedItem="{Binding SelectedMachineVersion}" DisplayMemberPath="Name" /> </DockPanel> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher/MainWindowVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.Publisher/MainWindowVM.cs index d429c8935..db0936e56 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher/MainWindowVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher/MainWindowVM.cs @@ -29,12 +29,6 @@ namespace Tango.PPC.Publisher { private IPPCUpdateService _client; -#if DEBUG - private String _appPath = AppDomain.CurrentDomain.BaseDirectory + "..\\..\\Debug\\PPC"; -#else - private String _appPath = AppDomain.CurrentDomain.BaseDirectory + "..\\..\\Release\\PPC"; -#endif - private BasicHashGenerator _hashGenerator; private List<MachineVersion> _machineVersions; @@ -51,6 +45,13 @@ namespace Tango.PPC.Publisher set { _selectedMachineVersion = value; RaisePropertyChangedAuto(); OnSelectedMachineVersionChanged(); } } + private String _selectedBuildConfiguration; + public String SelectedBuildConfiguration + { + get { return _selectedBuildConfiguration; } + set { _selectedBuildConfiguration = value; RaisePropertyChangedAuto(); } + } + private String _localVersion; public String LocalVersion { @@ -132,6 +133,8 @@ namespace Tango.PPC.Publisher public MainWindowVM() { + SelectedBuildConfiguration = "Release"; + _hashGenerator = new BasicHashGenerator(); SequenceItems = new ObservableCollection<SequenceItem>(); @@ -171,106 +174,108 @@ namespace Tango.PPC.Publisher private void Publish() { - Task.Factory.StartNew(() => - { - IsUpdating = true; - String tempFile = String.Empty; + String _appPath = String.Format(AppDomain.CurrentDomain.BaseDirectory + "..\\..\\{0}\\PPC", SelectedBuildConfiguration); - try + Task.Factory.StartNew(() => { - var response = _client.UploadVersion(new UploadVersionRequest() + IsUpdating = true; + String tempFile = String.Empty; + + try { - Comments = Comments, - Email = Email, - Password = _hashGenerator.Encrypt(Password), - Version = LocalVersion, - MachineVersionGuid = SelectedMachineVersion.Guid - }); + var response = _client.UploadVersion(new UploadVersionRequest() + { + Comments = Comments, + Email = Email, + Password = _hashGenerator.Encrypt(Password), + Version = LocalVersion, + MachineVersionGuid = SelectedMachineVersion.Guid + }); - tempFile = Path.Combine(Path.GetTempPath(), response.FileName); + tempFile = Path.Combine(Path.GetTempPath(), response.FileName); - using (ZipFile zip = new ZipFile()) - { - String sync_dir = "Synchronization Scripts"; + using (ZipFile zip = new ZipFile()) + { + String sync_dir = "Synchronization Scripts"; - zip.AddDirectoryByName(sync_dir); + zip.AddDirectoryByName(sync_dir); - ExaminerSequenceConfiguration config = new ExaminerSequenceConfiguration(); + ExaminerSequenceConfiguration config = new ExaminerSequenceConfiguration(); - foreach (var item in SequenceItems) - { - config.Items.Add(new ExaminerSequenceItem() + foreach (var item in SequenceItems) { - Direction = item.Direction, - FileName = item.FileName, - Index = item.Index, - Name = item.Name, - Type = item.Type, - RequiresSerialNumber = item.RequiresSerialNumber - }); + config.Items.Add(new ExaminerSequenceItem() + { + Direction = item.Direction, + FileName = item.FileName, + Index = item.Index, + Name = item.Name, + Type = item.Type, + RequiresSerialNumber = item.RequiresSerialNumber + }); - zip.AddFile(item.FilePath, sync_dir); - } + zip.AddFile(item.FilePath, sync_dir); + } - String config_file = TemporaryManager.Default.CreateFile(".zip"); - config.ToFile(config_file); + String config_file = TemporaryManager.Default.CreateFile(".zip"); + config.ToFile(config_file); - var cf = zip.AddFile(config_file, sync_dir); - cf.FileName = sync_dir + "\\config.xml"; + var cf = zip.AddFile(config_file, sync_dir); + cf.FileName = sync_dir + "\\config.xml"; - foreach (var file in Directory.GetFiles(_appPath, "*.*", SearchOption.TopDirectoryOnly)) - { - zip.AddFile(file, "/"); - } + foreach (var file in Directory.GetFiles(_appPath, "*.*", SearchOption.TopDirectoryOnly)) + { + zip.AddFile(file, "/"); + } - zip.SaveProgress += (x, e) => - { - MaxProgress = e.EntriesTotal; - Progress = e.EntriesSaved; - }; + zip.SaveProgress += (x, e) => + { + MaxProgress = e.EntriesTotal; + Progress = e.EntriesSaved; + }; - zip.Save(tempFile); - } + zip.Save(tempFile); + } - Progress = 0; - MaxProgress = 100; + Progress = 0; + MaxProgress = 100; - FileStreamWrapper fs = null; + FileStreamWrapper fs = null; - using (fs = new FileStreamWrapper(tempFile, FileMode.Open, (current) => - { - InvokeUINow(() => + using (fs = new FileStreamWrapper(tempFile, FileMode.Open, (current) => { - Thread.Sleep(10); - Progress = ((double)current / (double)fs.Length) * 100d; - }); - })) - { - using (FtpClient ftp = new FtpClient(response.FtpHost, response.UserName, response.Password)) + InvokeUINow(() => + { + Thread.Sleep(10); + Progress = ((double)current / (double)fs.Length) * 100d; + }); + })) { - ftp.ConnectAsync().Wait(); - ftp.UploadAsync(fs, response.FilePath, FtpExists.Overwrite, true).Wait(); + using (FtpClient ftp = new FtpClient(response.FtpHost, response.UserName, response.Password)) + { + ftp.ConnectAsync().Wait(); + ftp.UploadAsync(fs, response.FilePath, FtpExists.Overwrite, true).Wait(); + } } - } - _client.NotifyUploadCompleted(new UploadCompletedRequest() - { - Token = response.Token, - }); + _client.NotifyUploadCompleted(new UploadCompletedRequest() + { + Token = response.Token, + }); - Progress = 0; - OnSelectedMachineVersionChanged(); - ShowInfo("Version published successfully!"); - } - catch (Exception ex) - { - ShowError(ex.Message); - } - finally - { - IsUpdating = false; - } - }); + Progress = 0; + OnSelectedMachineVersionChanged(); + ShowInfo("Version published successfully!"); + } + catch (Exception ex) + { + ShowError(ex.Message); + } + finally + { + IsUpdating = false; + } + }); } private void ShowError(String error) diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher/Tango.PPC.Publisher.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Publisher/Tango.PPC.Publisher.csproj index ead460ec2..d8ed357c5 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher/Tango.PPC.Publisher.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher/Tango.PPC.Publisher.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\PPC\</OutputPath> + <OutputPath>..\..\Build\PPC\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -28,7 +28,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Debug\PPC\</OutputPath> + <OutputPath>..\..\Build\PPC\Debug\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs index e984b7452..db9ee3863 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs @@ -135,11 +135,11 @@ namespace Tango.PPC.UI.PPCApplication if (App.StartupArgs.Contains("-update_ok")) { LogManager.Log("Application started with '-update_ok' startup arguments. The application has been successfully updated."); - settings.ApplicationState = ApplicationStates.Default; + settings.ApplicationState = ApplicationStates.Ready; settings.Save(); } - if (settings.ApplicationState == ApplicationStates.Default) + if (settings.ApplicationState == ApplicationStates.Ready) { LogManager.Log("Initializing ObservablesEntitiesAdapter..."); ObservablesEntitiesAdapter.Instance.Initialize(); 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 d3e28de8d..eae39d380 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 @@ -36,7 +36,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\PPC\</OutputPath> + <OutputPath>..\..\Build\PPC\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -45,7 +45,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Release\PanelPC\</OutputPath> + <OutputPath>..\..\Build\PPC\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -328,10 +328,6 @@ </BootstrapperPackage> </ItemGroup> <ItemGroup> - <Content Include="..\..\Build\Debug\Tango.ColorLib.dll"> - <Link>Tango.ColorLib.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> <Resource Include="Images\package.png" /> <Resource Include="Images\setup.png" /> <Resource Include="Images\machine-trans.png" /> @@ -341,6 +337,12 @@ <Resource Include="Images\preloader_rectangles.gif" /> <Resource Include="Images\logo.png" /> </ItemGroup> + <ItemGroup> + <Content Include="..\..\Build\Native\Debug\Tango.ColorLib.dll"> + <Link>Tango.ColorLib.dll</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> @@ -404,7 +406,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\vcruntime140d.dll" "$(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.Updater/MainWindow.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml.cs index a1c68bd78..34e32a306 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml.cs @@ -29,6 +29,14 @@ namespace Tango.PPC.Updater public MainWindow() { + //Launch debugger.. +#if DEBUG + if (!Debugger.IsAttached) + { + Debugger.Launch(); + } +#endif + if (!Directory.Exists(_sourceFolder)) { ShowError("This update utility can only be executed by the main Tango."); @@ -60,7 +68,17 @@ namespace Tango.PPC.Updater private void MainWindow_ContentRendered(object sender, EventArgs e) { - Update(); + try + { + Update(); + } + catch (Exception ex) + { + Debug.WriteLine(ex.ToString()); + ShowError(ex.Message); + StartTango(); + Environment.Exit(0); + } } private void Update() @@ -92,14 +110,7 @@ namespace Tango.PPC.Updater foreach (string dirPath in Directory.GetDirectories(_sourceFolder, "*", SearchOption.AllDirectories)) { - try - { - Directory.CreateDirectory(dirPath.Replace(_sourceFolder, _appPath)); - } - catch (Exception ex) - { - ShowError("Could not create directory " + Path.GetFileName(dirPath) + Environment.NewLine + ex.Message); - } + Directory.CreateDirectory(dirPath.Replace(_sourceFolder, _appPath)); } foreach (string newPath in Directory.GetFiles(_sourceFolder, "*.*", SearchOption.AllDirectories)) @@ -121,10 +132,19 @@ namespace Tango.PPC.Updater { if (!newPath.ToLower().Contains("updater.exe")) { - ShowError("Could not create file " + Path.GetFileName(newPath) + Environment.NewLine + ex.Message); + throw ex; } } } + + try + { + Directory.Delete(_sourceFolder, true); + } + catch (Exception ex) + { + Debug.WriteLine(ex.ToString()); + } } private void EnsureTangoIsDown() diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Updater/Tango.PPC.Updater.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Updater/Tango.PPC.Updater.csproj index 41b03e807..96a464c0e 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Updater/Tango.PPC.Updater.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Updater/Tango.PPC.Updater.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\PPC\</OutputPath> + <OutputPath>..\..\Build\PPC\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -28,7 +28,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Release\PPC\</OutputPath> + <OutputPath>..\..\Build\PPC\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj index 92145adcc..587f1e74d 100644 --- a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj +++ b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj @@ -52,14 +52,14 @@ <FileAlignment>4096</FileAlignment> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> - <OutputPath>bin\Debug\</OutputPath> + <OutputPath>..\..\Build\Core\Debug\</OutputPath> <DocumentationFile> </DocumentationFile> <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> <Prefer32Bit>false</Prefer32Bit> - <OutputPath>..\..\Build\Release\</OutputPath> + <OutputPath>..\..\Build\Core\Release\</OutputPath> <DocumentationFile /> </PropertyGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> @@ -468,7 +468,7 @@ </ItemGroup> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UseGlobalSettings="True" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.AnimatedGif/Tango.AnimatedGif.csproj b/Software/Visual_Studio/Tango.AnimatedGif/Tango.AnimatedGif.csproj index 5be1f5281..7ef6a0182 100644 --- a/Software/Visual_Studio/Tango.AnimatedGif/Tango.AnimatedGif.csproj +++ b/Software/Visual_Studio/Tango.AnimatedGif/Tango.AnimatedGif.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -28,7 +28,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -82,7 +82,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 62e23539a..5a46b476a 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -27,7 +27,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -319,7 +319,7 @@ </Target> <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/Tango.BrushPicker/Tango.BrushPicker.csproj b/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj index b2111ca95..6cde62c7b 100644 --- a/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj +++ b/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj @@ -21,7 +21,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -30,7 +30,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -90,7 +90,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj b/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj index c13f50c43..7a2417457 100644 --- a/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj +++ b/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj b/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj index 03cfd7d20..09042eca0 100644 --- a/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj +++ b/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj @@ -40,7 +40,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -49,7 +49,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -120,7 +120,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj index 3ff0d7669..a9517f3b2 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj +++ b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj @@ -20,7 +20,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -28,7 +28,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -118,7 +118,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj b/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj index 7d6350587..7ba9d27fc 100644 --- a/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj +++ b/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj @@ -23,7 +23,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -31,7 +31,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -151,7 +151,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj index 6dcaf2505..d3af5d59b 100644 --- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj +++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -153,7 +153,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj index 7c38f01d7..b8051c108 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj +++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj @@ -18,7 +18,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -270,7 +270,7 @@ </Target> <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/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index c6440fe68..3ab4194f9 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -18,7 +18,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -356,7 +356,7 @@ </Target> <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/Tango.Documents/Tango.Documents.csproj b/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj index b1353cfdb..f688f005b 100644 --- a/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj +++ b/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -87,7 +87,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Tango.DragAndDrop/Tango.DragAndDrop.csproj b/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj index 385ccd970..41c31954a 100644 --- a/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj +++ b/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj @@ -23,7 +23,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -33,7 +33,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -108,7 +108,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj b/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj index 2080a0ac9..b0f6184ae 100644 --- a/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj +++ b/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj @@ -22,7 +22,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -30,7 +30,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -168,7 +168,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Embroidery/Tango.EmbroideryUI/EmbroideryFileConverter.cs b/Software/Visual_Studio/Tango.EmbroideryUI/EmbroideryFileConverter.cs index b4752f2a6..b4752f2a6 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/EmbroideryFileConverter.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/EmbroideryFileConverter.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/EmbroideryFileEditor.xaml b/Software/Visual_Studio/Tango.EmbroideryUI/EmbroideryFileEditor.xaml index 34f1aec7e..34f1aec7e 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/EmbroideryFileEditor.xaml +++ b/Software/Visual_Studio/Tango.EmbroideryUI/EmbroideryFileEditor.xaml diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/EmbroideryFileEditor.xaml.cs b/Software/Visual_Studio/Tango.EmbroideryUI/EmbroideryFileEditor.xaml.cs index 6b86c68cb..6b86c68cb 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/EmbroideryFileEditor.xaml.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/EmbroideryFileEditor.xaml.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/EmbroideryMaterialsHelper.cs b/Software/Visual_Studio/Tango.EmbroideryUI/EmbroideryMaterialsHelper.cs index 86704a2fd..86704a2fd 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/EmbroideryMaterialsHelper.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/EmbroideryMaterialsHelper.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/EmbroideryPath.cs b/Software/Visual_Studio/Tango.EmbroideryUI/EmbroideryPath.cs index 33f14cd27..33f14cd27 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/EmbroideryPath.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/EmbroideryPath.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/IEmbroideryMaterial.cs b/Software/Visual_Studio/Tango.EmbroideryUI/IEmbroideryMaterial.cs index e1d304086..e1d304086 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/IEmbroideryMaterial.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/IEmbroideryMaterial.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Jersey.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Jersey.cs index 004a67940..004a67940 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Jersey.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Jersey.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Leather.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Leather.cs index 5cf26d890..5cf26d890 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Leather.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Leather.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Linen.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Linen.cs index db7f2fcaa..db7f2fcaa 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Linen.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Linen.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Lycra.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Lycra.cs index 1e020d3f2..1e020d3f2 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Lycra.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Lycra.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Mesh.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Mesh.cs index e99dd4823..e99dd4823 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Mesh.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Mesh.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/MicroFiber.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/MicroFiber.cs index 51b16afe7..51b16afe7 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/MicroFiber.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/MicroFiber.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Nylon.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Nylon.cs index 9cf33d1ee..9cf33d1ee 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Nylon.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Nylon.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Pique.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Pique.cs index 1263b23d2..1263b23d2 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Pique.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Pique.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/PolyCotton.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/PolyCotton.cs index 7dacaa945..7dacaa945 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/PolyCotton.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/PolyCotton.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Polyester.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Polyester.cs index 7c915f138..7c915f138 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Polyester.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Polyester.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/PureCotton.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/PureCotton.cs index 270756af2..270756af2 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/PureCotton.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/PureCotton.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Rayon.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Rayon.cs index e71258aba..e71258aba 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Materials/Rayon.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Materials/Rayon.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs index 352105b64..352105b64 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/Resources.Designer.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/Resources.Designer.cs index 9b7380fa5..9b7380fa5 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/Resources.Designer.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/Resources.Designer.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/Resources.resx b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/Resources.resx index af7dbebba..af7dbebba 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/Resources.resx +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/Resources.resx diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/Settings.Designer.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/Settings.Designer.cs index 4825e890a..4825e890a 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/Settings.Designer.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/Settings.Designer.cs diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/Settings.settings b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/Settings.settings index 033d7a5e9..033d7a5e9 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/Settings.settings +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/Settings.settings diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj b/Software/Visual_Studio/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj index 8d90477a6..c68b620a1 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -56,7 +56,7 @@ </Page> </ItemGroup> <ItemGroup> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> + <Compile Include="..\Versioning\GlobalVersionInfo.cs"> <Link>GlobalVersionInfo.cs</Link> </Compile> <Compile Include="EmbroideryFileConverter.cs" /> @@ -103,19 +103,19 @@ </None> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\Tango.Core\Tango.Core.csproj"> + <ProjectReference Include="..\Tango.Core\Tango.Core.csproj"> <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project> <Name>Tango.Core</Name> </ProjectReference> - <ProjectReference Include="..\..\Tango.Editors\Tango.Editors.csproj"> + <ProjectReference Include="..\Tango.Editors\Tango.Editors.csproj"> <Project>{de2f2b86-025b-4f26-83a4-38bd48224ed5}</Project> <Name>Tango.Editors</Name> </ProjectReference> - <ProjectReference Include="..\..\Tango.PMR\Tango.PMR.csproj"> + <ProjectReference Include="..\Tango.PMR\Tango.PMR.csproj"> <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project> <Name>Tango.PMR</Name> </ProjectReference> - <ProjectReference Include="..\..\Tango.SharedUI\Tango.SharedUI.csproj"> + <ProjectReference Include="..\Tango.SharedUI\Tango.SharedUI.csproj"> <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project> <Name>Tango.SharedUI</Name> </ProjectReference> diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/app.config b/Software/Visual_Studio/Tango.EmbroideryUI/app.config index 462d17b27..462d17b27 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/app.config +++ b/Software/Visual_Studio/Tango.EmbroideryUI/app.config diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/packages.config b/Software/Visual_Studio/Tango.EmbroideryUI/packages.config index 6d9929c06..6d9929c06 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/packages.config +++ b/Software/Visual_Studio/Tango.EmbroideryUI/packages.config diff --git a/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj b/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj index ee358a153..ec7315668 100644 --- a/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj +++ b/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -89,7 +89,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Tango.Hive/Tango.Hive.csproj b/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj index 1b6957b12..bda3d1d85 100644 --- a/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj +++ b/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -28,7 +28,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -89,7 +89,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj index 3b97266e4..035bbbe1f 100644 --- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj +++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj @@ -16,7 +16,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -24,7 +24,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -151,7 +151,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj b/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj index 63cd773e4..4f4918e19 100644 --- a/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj +++ b/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -77,7 +77,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj index 4f305fa66..0609b7bff 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -204,11 +204,11 @@ </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <PropertyGroup> - <PreBuildEvent>"$(TargetDir)..\Debug\proto-tc.exe" -i "$(SolutionDir)..\PMR\Messages" -o "$(SolutionDir)Tango.PMR" -l CSharp</PreBuildEvent> + <PreBuildEvent>"$(SolutionDir)Build\Utilities\Debug\proto-tc.exe" -i "$(SolutionDir)..\PMR\Messages" -o "$(SolutionDir)Tango.PMR" -l CSharp</PreBuildEvent> </PropertyGroup> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj b/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj index 4df4e060c..1b1abc9f4 100644 --- a/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj +++ b/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -84,7 +84,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Tango.SQLExaminer/Tango.SQLExaminer.csproj b/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj index 261794b0e..cfa6aa282 100644 --- a/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj +++ b/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj @@ -16,7 +16,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -24,7 +24,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj b/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj index 26a9aa3af..b6503101c 100644 --- a/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj +++ b/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -27,7 +27,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -175,7 +175,7 @@ <Import Project="..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" /> <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/Tango.Serialization/Tango.Serialization.csproj b/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj index 2b99472a0..91cac4c16 100644 --- a/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj +++ b/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj @@ -16,7 +16,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -24,7 +24,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -63,7 +63,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Tango.Settings/Tango.Settings.csproj b/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj index 25966e559..1f6596c0d 100644 --- a/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj +++ b/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj @@ -16,7 +16,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -24,7 +24,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -62,7 +62,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj index 5aa7f9806..a17b66caf 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj +++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj @@ -18,7 +18,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -225,7 +225,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Tango.Stubs/Tango.Stubs.csproj b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj index 373939019..f270043c1 100644 --- a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj +++ b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -179,7 +179,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Tango.Synchronization/Tango.Synchronization.csproj b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj index 45cf5cff9..e02b737ab 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj +++ b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -27,7 +27,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -126,7 +126,7 @@ </Target> <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/Tango.TFS/Tango.TFS.csproj b/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj index 2e91eff8e..f34892c4e 100644 --- a/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj +++ b/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -27,7 +27,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -263,7 +263,7 @@ </Target> <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/Tango.Touch/Tango.Touch.csproj b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj index fc0c13207..3b66f6c61 100644 --- a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj +++ b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -374,7 +374,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj b/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj index 6456be076..608538578 100644 --- a/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj +++ b/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -129,7 +129,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj index c2849f400..0bf97caa6 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj +++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj @@ -25,7 +25,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>0</WarningLevel> @@ -35,7 +35,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -202,7 +202,7 @@ <Import Project="..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" /> <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/Tango.Video/Tango.Video.csproj b/Software/Visual_Studio/Tango.Video/Tango.Video.csproj index 81e39d411..e485ce615 100644 --- a/Software/Visual_Studio/Tango.Video/Tango.Video.csproj +++ b/Software/Visual_Studio/Tango.Video/Tango.Video.csproj @@ -20,7 +20,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -32,7 +32,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -141,7 +141,7 @@ <Import Project="..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" /> <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/Tango.Visuals/Tango.Visuals.csproj b/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj index acd59b58e..337b91faa 100644 --- a/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj +++ b/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Build\Debug\</OutputPath> + <OutputPath>..\Build\Core\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -27,7 +27,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\Build\Release\</OutputPath> + <OutputPath>..\Build\Core\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -216,7 +216,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 94174e8a4..861294767 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -150,8 +150,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tango.Embroidery", "Embroid EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.EmbroideryViewer", "Utilities\Tango.EmbroideryViewer\Tango.EmbroideryViewer.csproj", "{793FBFC1-549E-458B-A52F-784BD4F28586}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.EmbroideryUI", "Embroidery\Tango.EmbroideryUI\Tango.EmbroideryUI.csproj", "{BDBBE284-F564-4F51-AF41-3DF0434CEC62}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.BrushPicker", "Tango.BrushPicker\Tango.BrushPicker.csproj", "{40085232-ACED-4CBE-945B-90BA8153C151}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.MachineStudio.ColorLab", "MachineStudio\Modules\Tango.MachineStudio.ColorLab\Tango.MachineStudio.ColorLab.csproj", "{4D183ACA-552B-4135-AE81-7C5A8E5FC3B1}" @@ -222,6 +220,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Updater", "PPC\Ta EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.EventsTypesGenerator", "Utilities\Tango.EventsTypesGenerator\Tango.EventsTypesGenerator.csproj", "{0BDA9B52-9879-4C5E-84E3-81D00B75DACC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.EmbroideryUI", "Tango.EmbroideryUI\Tango.EmbroideryUI.csproj", "{BDBBE284-F564-4F51-AF41-3DF0434CEC62}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution AppVeyor|Any CPU = AppVeyor|Any CPU @@ -2627,46 +2627,6 @@ Global {793FBFC1-549E-458B-A52F-784BD4F28586}.Release|x64.Build.0 = Release|Any CPU {793FBFC1-549E-458B-A52F-784BD4F28586}.Release|x86.ActiveCfg = Release|Any CPU {793FBFC1-549E-458B-A52F-784BD4F28586}.Release|x86.Build.0 = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|Any CPU.Build.0 = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|ARM.ActiveCfg = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|ARM.Build.0 = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|ARM64.Build.0 = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|x64.ActiveCfg = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|x64.Build.0 = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|x86.ActiveCfg = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|x86.Build.0 = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|ARM.ActiveCfg = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|ARM.Build.0 = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|ARM64.Build.0 = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|x64.ActiveCfg = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|x64.Build.0 = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|x86.ActiveCfg = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|x86.Build.0 = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|ARM.Build.0 = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|x64.Build.0 = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|x86.Build.0 = Debug|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|Any CPU.Build.0 = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|ARM.ActiveCfg = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|ARM.Build.0 = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|ARM64.ActiveCfg = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|ARM64.Build.0 = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|x64.ActiveCfg = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|x64.Build.0 = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|x86.ActiveCfg = Release|Any CPU - {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|x86.Build.0 = Release|Any CPU {40085232-ACED-4CBE-945B-90BA8153C151}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU {40085232-ACED-4CBE-945B-90BA8153C151}.AppVeyor|Any CPU.Build.0 = Release|Any CPU {40085232-ACED-4CBE-945B-90BA8153C151}.AppVeyor|ARM.ActiveCfg = Release|Any CPU @@ -3901,6 +3861,46 @@ Global {0BDA9B52-9879-4C5E-84E3-81D00B75DACC}.Release|x64.Build.0 = Release|Any CPU {0BDA9B52-9879-4C5E-84E3-81D00B75DACC}.Release|x86.ActiveCfg = Release|Any CPU {0BDA9B52-9879-4C5E-84E3-81D00B75DACC}.Release|x86.Build.0 = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|Any CPU.Build.0 = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|ARM.ActiveCfg = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|ARM.Build.0 = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|ARM64.Build.0 = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|x64.ActiveCfg = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|x64.Build.0 = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|x86.ActiveCfg = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.AppVeyor|x86.Build.0 = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|ARM.ActiveCfg = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|ARM.Build.0 = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|ARM64.Build.0 = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|x64.ActiveCfg = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|x64.Build.0 = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|x86.ActiveCfg = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Debug|x86.Build.0 = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|ARM.Build.0 = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|x64.Build.0 = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.DefaultBuild|x86.Build.0 = Debug|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|Any CPU.Build.0 = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|ARM.ActiveCfg = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|ARM.Build.0 = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|ARM64.ActiveCfg = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|ARM64.Build.0 = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|x64.ActiveCfg = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|x64.Build.0 = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|x86.ActiveCfg = Release|Any CPU + {BDBBE284-F564-4F51-AF41-3DF0434CEC62}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3945,7 +3945,6 @@ Global {5AFD5B7D-757A-400C-B0C9-118834F5D67E} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760} {A37247ED-B26B-42EE-9F3B-EF0FDEB381F1} = {34839F9A-61D3-4ED3-B3F7-7DA3424CB0B6} {793FBFC1-549E-458B-A52F-784BD4F28586} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760} - {BDBBE284-F564-4F51-AF41-3DF0434CEC62} = {34839F9A-61D3-4ED3-B3F7-7DA3424CB0B6} {4D183ACA-552B-4135-AE81-7C5A8E5FC3B1} = {B2AF4F3F-2828-47C3-8F3E-A0EA0BD66FF8} {88028F14-0028-4DED-B119-19B8EE23CF32} = {B2AF4F3F-2828-47C3-8F3E-A0EA0BD66FF8} {1674F726-0E66-414F-B9FD-C6F20D7F07C7} = {B2AF4F3F-2828-47C3-8F3E-A0EA0BD66FF8} @@ -3971,12 +3970,12 @@ Global {0BDA9B52-9879-4C5E-84E3-81D00B75DACC} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} - BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_UpdateFileVersion = False - BuildVersion_StartDate = 2000/1/1 - BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs BuildVersion_UseGlobalSettings = False + BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs + BuildVersion_StartDate = 2000/1/1 + BuildVersion_UpdateFileVersion = False + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear + SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} EndGlobalSection EndGlobal diff --git a/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj b/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj index 794591812..d799e8231 100644 --- a/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj +++ b/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -92,7 +92,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj index 9dc692113..85e4e5687 100644 --- a/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -69,7 +69,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Utilities/Tango.DBObservablesGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Program.cs index e04f1a304..f4295cafe 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Program.cs @@ -19,7 +19,7 @@ namespace Tango.DBObservablesGenerator.CLI #if DEBUG args = new string[] { - Path.GetFullPath( "..\\..\\Tango.BL"), + Path.GetFullPath( "..\\..\\..\\Tango.BL"), "-csharp" }; #endif diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj index da4c65e05..3b2e82a0b 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -84,7 +84,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj index 8d76d01f4..b059730b3 100644 --- a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj +++ b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -28,7 +28,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -102,14 +102,14 @@ <None Include="App.config" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\Embroidery\Tango.EmbroideryUI\Tango.EmbroideryUI.csproj"> - <Project>{bdbbe284-f564-4f51-af41-3df0434cec62}</Project> - <Name>Tango.EmbroideryUI</Name> - </ProjectReference> <ProjectReference Include="..\..\Tango.Editors\Tango.Editors.csproj"> <Project>{de2f2b86-025b-4f26-83a4-38bd48224ed5}</Project> <Name>Tango.Editors</Name> </ProjectReference> + <ProjectReference Include="..\..\Tango.EmbroideryUI\Tango.EmbroideryUI.csproj"> + <Project>{bdbbe284-f564-4f51-af41-3df0434cec62}</Project> + <Name>Tango.EmbroideryUI</Name> + </ProjectReference> <ProjectReference Include="..\..\Tango.PMR\Tango.PMR.csproj"> <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project> <Name>Tango.PMR</Name> @@ -118,7 +118,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj index 6ab5723a7..8f335190b 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj index 85fcc6d94..d7cae7a29 100644 --- a/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -60,7 +60,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj index 5eda44601..b751815ce 100644 --- a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -28,7 +28,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -118,7 +118,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj index 71011a702..8df299f0e 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -28,7 +28,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -189,11 +189,11 @@ </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <PropertyGroup> - <PostBuildEvent>$(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Machine Emulator.lnk"</PostBuildEvent> + <PostBuildEvent>$(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(SolutionDir)Build\Shortcuts\Machine Emulator.lnk"</PostBuildEvent> </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/Utilities/Tango.PMRGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs index 96f0ed441..d9f4c690f 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs @@ -26,7 +26,7 @@ namespace Tango.PMRGenerator.CLI Console.WriteLine(); Environment.CurrentDirectory = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); - String pmrFolder = "..\\..\\..\\PMR\\Messages"; + String pmrFolder = Path.GetFullPath("..\\..\\..\\..\\PMR\\Messages"); using (ObservablesContext db = ObservablesContext.CreateDefault()) { diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj index 58f22c733..543fab734 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -76,7 +76,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj index 21e3f2657..e2119e7b1 100644 --- a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -80,7 +80,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Utilities/Tango.Protobuf.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Program.cs index d0c4ba1fe..51e3993d6 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Program.cs @@ -19,10 +19,10 @@ namespace Tango.Protobuf.CLI if (args.Length == 0) { - args = new string[] + args = new string[] { - "-i ..\\..\\..\\PMR\\Messages", - "-o ..\\..\\Tango.PMR", + "-i " + Path.GetFullPath("..\\..\\..\\..\\PMR\\Messages"), + "-o " + Path.GetFullPath("..\\..\\..\\Tango.PMR"), "-l CSharp", }; } diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj index 97b2b6e99..d51e2c019 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -65,7 +65,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj index 7c2144ba1..3ae824d59 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -28,7 +28,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -150,11 +150,11 @@ </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <PropertyGroup> - <PostBuildEvent>$(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Proto Compiler GUI.lnk"</PostBuildEvent> + <PostBuildEvent>$(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(SolutionDir)Build\Shortcuts\Proto Compiler GUI.lnk"</PostBuildEvent> </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/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj index e57fa1825..df2fc762a 100644 --- a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj @@ -21,7 +21,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -30,7 +30,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Release\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -174,7 +174,7 @@ <Import Project="..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" /> <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/Utilities/Tango.SQLiteGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs index 1f28e4e89..b254833a6 100644 --- a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs @@ -27,7 +27,7 @@ namespace Tango.SQLiteGenerator.CLI #if DEBUG args = new string[] { - Path.GetFullPath( "..\\..\\..\\DB\\Tango.db"), + Path.GetFullPath( "..\\..\\..\\..\\DB\\Tango.db"), "CopyAll" }; #endif diff --git a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj index 9445911ee..2fe5bf15d 100644 --- a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -80,7 +80,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj index 4a9081dec..70f711bba 100644 --- a/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj @@ -17,7 +17,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -26,7 +26,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -79,7 +79,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj index d2b9b3ad9..3ed5b46b2 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -28,7 +28,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Release\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -93,7 +93,7 @@ <Import Project="..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" /> <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/Utilities/Tango.Stubs.Installer/Tango.Stubs.Installer.vdproj b/Software/Visual_Studio/Utilities/Tango.Stubs.Installer/Tango.Stubs.Installer.vdproj index ae035b019..c1b6b55eb 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.Installer/Tango.Stubs.Installer.vdproj +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.Installer/Tango.Stubs.Installer.vdproj @@ -51,6 +51,12 @@ } "Entry" { + "MsmKey" = "8:_26C8B1E59005AA275768E40814279D6A" + "OwnerKey" = "8:_92474495A2F0D65A21D2BFF4587358D8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_2DC8C87C2D90158064A700C697B49957" "OwnerKey" = "8:_F35F069FCC8C9B6808AAD45B8039A4FB" "MsmSig" = "8:_UNDEFINED" @@ -622,6 +628,12 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_26C8B1E59005AA275768E40814279D6A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_8B8BABD8173D326B3175B52925968439" "MsmSig" = "8:_UNDEFINED" } @@ -777,7 +789,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:..\\..\\Build\\Debug\\Installers\\Tango Stubs Installer v3.2.msi" + "OutputFilename" = "8:..\\..\\Build\\Installers\\Stubs UI\\Debug\\Stubs UI Installer v1.0.0.5.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -809,7 +821,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:..\\..\\Build\\Release\\Installers\\Tango Stubs Installer v1.0.msi" + "OutputFilename" = "8:..\\..\\Build\\Installers\\Stubs UI\\Release\\Stubs UI Installer v1.0.0.5.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -871,11 +883,6 @@ "AssemblyAsmDisplayName" = "8:ColorMine, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_06C47D47C126843F16D4326EAD98A9F8" - { - "Name" = "8:ColorMine.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:ColorMine.DLL" "TargetName" = "8:" @@ -899,14 +906,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Scripting, Version=2.0.21.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Scripting, Version=2.0.23.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_0712ECEB4DE24D8B9E9936D94BDC61B4" - { - "Name" = "8:Tango.Scripting.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:..\\..\\Build\\Debug\\Tango.Scripting.dll" "TargetName" = "8:" @@ -959,11 +961,6 @@ "AssemblyAsmDisplayName" = "8:Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL" "ScatterAssemblies" { - "_13F82A52BE0C4D8A8602D03A12CC09C2" - { - "Name" = "8:Google.Protobuf.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:..\\..\\Build\\Debug\\Google.Protobuf.dll" "TargetName" = "8:" @@ -1018,16 +1015,42 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.PMR, Version=2.0.27.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.PMR, Version=2.0.33.1633, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + } + "SourcePath" = "8:..\\..\\Build\\Debug\\Tango.PMR.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_D5AAD35A4ABE407AA40E02371659B408" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_26C8B1E59005AA275768E40814279D6A" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_25CD57B9CA3242F18E33F548DDB13C14" + "_26C8B1E59005AA275768E40814279D6A" { - "Name" = "8:Tango.PMR.dll" + "Name" = "8:System.Net.Http.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:..\\..\\Build\\Debug\\Tango.PMR.dll" + "SourcePath" = "8:System.Net.Http.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_D5AAD35A4ABE407AA40E02371659B408" @@ -1042,7 +1065,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2DC8C87C2D90158064A700C697B49957" @@ -1052,11 +1075,6 @@ "AssemblyAsmDisplayName" = "8:Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL" "ScatterAssemblies" { - "_2DC8C87C2D90158064A700C697B49957" - { - "Name" = "8:Google.Protobuf.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Google.Protobuf.DLL" "TargetName" = "8:" @@ -1083,11 +1101,6 @@ "AssemblyAsmDisplayName" = "8:EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" "ScatterAssemblies" { - "_431494AD14D6D56BB1D8134155637969" - { - "Name" = "8:EntityFramework.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:EntityFramework.DLL" "TargetName" = "8:" @@ -1111,14 +1124,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.PMR, Version=2.0.27.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.PMR, Version=2.0.33.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_5397E5B2CD05015FD556CF7136D97D21" - { - "Name" = "8:Tango.PMR.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.PMR.DLL" "TargetName" = "8:" @@ -1142,14 +1150,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.BL, Version=2.0.24.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.BL, Version=2.0.29.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_5917DC90155EF9A2065894D138595C1A" - { - "Name" = "8:Tango.BL.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.BL.DLL" "TargetName" = "8:" @@ -1173,14 +1176,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:StubsExecutionGUI, Version=3.2.3.1608, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:StubsExecutionGUI, Version=3.2.4.1347, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_61BDC9339D1440BCBC454CC904BCE79C" - { - "Name" = "8:StubsExecutionGUI.exe" - "Attributes" = "3:512" - } } "SourcePath" = "8:..\\..\\Build\\Debug\\StubsExecutionGUI.exe" "TargetName" = "8:" @@ -1204,14 +1202,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Scripting, Version=2.0.21.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Scripting, Version=2.0.23.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_6290C6253BE08D5AEAF445DC538F5A32" - { - "Name" = "8:Tango.Scripting.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.Scripting.DLL" "TargetName" = "8:" @@ -1238,11 +1231,6 @@ "AssemblyAsmDisplayName" = "8:System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" "ScatterAssemblies" { - "_65CE51F98CEBE9E3D46589DB414FAA93" - { - "Name" = "8:System.Reactive.Interfaces.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Reactive.Interfaces.DLL" "TargetName" = "8:" @@ -1269,11 +1257,6 @@ "AssemblyAsmDisplayName" = "8:System.Reactive.PlatformServices, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" "ScatterAssemblies" { - "_65F10524C176E1962250235480A84A48" - { - "Name" = "8:System.Reactive.PlatformServices.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Reactive.PlatformServices.DLL" "TargetName" = "8:" @@ -1297,14 +1280,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Stubs, Version=2.0.6.1407, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Stubs, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_6FEB8025486340DF9AA20A626115CC5C" - { - "Name" = "8:Tango.Stubs.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:..\\..\\Build\\Debug\\Tango.Stubs.dll" "TargetName" = "8:" @@ -1331,11 +1309,6 @@ "AssemblyAsmDisplayName" = "8:System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" "ScatterAssemblies" { - "_72B65244C4FF9BF01D372402C3CE52C5" - { - "Name" = "8:System.Reactive.Linq.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Reactive.Linq.DLL" "TargetName" = "8:" @@ -1359,14 +1332,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Settings, Version=2.0.23.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Settings, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_78C9B7DB89C8CFF3E6F812DBDAF18DC7" - { - "Name" = "8:Tango.Settings.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.Settings.DLL" "TargetName" = "8:" @@ -1390,14 +1358,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Integration, Version=2.0.22.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Integration, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_7998F663E6A123C428ACD5825DA63527" - { - "Name" = "8:Tango.Integration.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.Integration.DLL" "TargetName" = "8:" @@ -1421,14 +1384,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Serialization, Version=2.0.23.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Serialization, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_8B8BABD8173D326B3175B52925968439" - { - "Name" = "8:Tango.Serialization.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.Serialization.DLL" "TargetName" = "8:" @@ -1452,14 +1410,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.SharedUI, Version=2.0.21.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.SharedUI, Version=2.0.24.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_8F0D060313A40E3D6C4B196C5819AA1F" - { - "Name" = "8:Tango.SharedUI.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.SharedUI.DLL" "TargetName" = "8:" @@ -1483,14 +1436,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Transport, Version=2.0.22.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Transport, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_92474495A2F0D65A21D2BFF4587358D8" - { - "Name" = "8:Tango.Transport.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.Transport.DLL" "TargetName" = "8:" @@ -1514,14 +1462,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Stubs, Version=2.0.6.1407, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Stubs, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_94CDF51D67BB69C2699CEC4485EBCA30" - { - "Name" = "8:Tango.Stubs.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.Stubs.DLL" "TargetName" = "8:" @@ -1548,11 +1491,6 @@ "AssemblyAsmDisplayName" = "8:System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" "ScatterAssemblies" { - "_9E54529BF03690F97BEE24C45258265B" - { - "Name" = "8:System.Reactive.Core.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Reactive.Core.DLL" "TargetName" = "8:" @@ -1579,11 +1517,6 @@ "AssemblyAsmDisplayName" = "8:System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A09EFD9A2681B7EEE293BB3C3E00C524" - { - "Name" = "8:System.Windows.Interactivity.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Windows.Interactivity.DLL" "TargetName" = "8:" @@ -1607,14 +1540,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.DragAndDrop, Version=2.0.21.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.DragAndDrop, Version=2.0.23.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_B752AAD601735A1787F5E610419AB05C" - { - "Name" = "8:Tango.DragAndDrop.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.DragAndDrop.DLL" "TargetName" = "8:" @@ -1641,11 +1569,6 @@ "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" "ScatterAssemblies" { - "_B903CCAAE77F80B733B5FF7D00A8E88A" - { - "Name" = "8:Newtonsoft.Json.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Newtonsoft.Json.DLL" "TargetName" = "8:" @@ -1669,14 +1592,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Logging, Version=2.0.28.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Logging, Version=2.0.30.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_BFCEC942CF3BF1B9FB6AEACA2A8753C3" - { - "Name" = "8:Tango.Logging.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.Logging.DLL" "TargetName" = "8:" @@ -1734,11 +1652,6 @@ "AssemblyAsmDisplayName" = "8:ICSharpCode.AvalonEdit, Version=1.0.18.1933, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D2FFB7AB335C92855094B6988900F58C" - { - "Name" = "8:ICSharpCode.AvalonEdit.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:ICSharpCode.AvalonEdit.DLL" "TargetName" = "8:" @@ -1765,11 +1678,6 @@ "AssemblyAsmDisplayName" = "8:SimpleValidator, Version=0.6.1.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_DE92CA29E3DCD5F35FD39C7351489051" - { - "Name" = "8:SimpleValidator.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:SimpleValidator.DLL" "TargetName" = "8:" @@ -1796,11 +1704,6 @@ "AssemblyAsmDisplayName" = "8:stubexec, Version=2.0.1.1407, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_E6DED22BB43E475B9794561C384D2713" - { - "Name" = "8:stubexec.exe" - "Attributes" = "3:512" - } } "SourcePath" = "8:..\\..\\Build\\Debug\\stubexec.exe" "TargetName" = "8:" @@ -1827,11 +1730,6 @@ "AssemblyAsmDisplayName" = "8:MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL" "ScatterAssemblies" { - "_E8DB13B92FF4C290BF9E84F6AD1DE386" - { - "Name" = "8:MahApps.Metro.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:MahApps.Metro.DLL" "TargetName" = "8:" @@ -1855,14 +1753,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Core, Version=2.0.24.1034, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Core, Version=2.0.26.1633, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_F35F069FCC8C9B6808AAD45B8039A4FB" - { - "Name" = "8:Tango.Core.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Tango.Core.DLL" "TargetName" = "8:" diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj index ee9383e0a..e2f57e4c6 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj @@ -21,7 +21,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -30,7 +30,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Release\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -176,7 +176,7 @@ </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <PropertyGroup> - <PostBuildEvent>if $(ConfigurationName) == Debug $(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Stubs Execution GUI.lnk"</PostBuildEvent> + <PostBuildEvent>if $(ConfigurationName) == Debug $(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(SolutionDir)Build\Shortcuts\Stubs Execution GUI.lnk"</PostBuildEvent> </PropertyGroup> <Import Project="..\..\packages\Fody.2.0.0\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> @@ -189,7 +189,7 @@ <Import Project="..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" /> <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/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj index 3ec19f785..89d7aa2f9 100644 --- a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj @@ -19,7 +19,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\</OutputPath> + <OutputPath>..\..\Build\Utilities\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -28,7 +28,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\Release\</OutputPath> + <OutputPath>..\..\Build\Utilities\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -144,11 +144,11 @@ </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <PropertyGroup> - <PostBuildEvent>if $(ConfigurationName) == Debug $(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Transport Router.lnk"</PostBuildEvent> + <PostBuildEvent>if $(ConfigurationName) == Debug $(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(SolutionDir)Build\Shortcuts\Transport Router.lnk"</PostBuildEvent> </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/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj index 9beaf8923..87d50b99d 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj +++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj @@ -220,10 +220,7 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <Content Include="..\..\..\DB\Tango.db"> - <Link>App_Data\Tango.db</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> + <Folder Include="App_Data\" /> </ItemGroup> <PropertyGroup> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> @@ -251,7 +248,7 @@ <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> </WebProjectProperties> </FlavorProperties> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |