From 77b36e1accf0f5f119dbf34615ba840365879ca7 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Mon, 10 Oct 2016 15:24:23 +0200 Subject: [PATCH] update project files --- VECTO.sln | 2 -- VECTO/VECTO.vbproj | 16 +++++++++------- .../VectoAuxiliaries/VectoAuxiliaries.vbproj | 12 ++++++++---- .../VectoAuxiliariesTests.vbproj | 12 ++++++++---- .../AdvancedAuxiliaryInterfaces.vbproj | 12 ++++++++---- VectoCommon/VectoCommon/VectoCommon.csproj | 2 ++ VectoConsole/Program.cs | 2 -- VectoConsole/VectoConsole.csproj | 11 ++++++++--- 8 files changed, 43 insertions(+), 26 deletions(-) diff --git a/VECTO.sln b/VECTO.sln index a7af431e59..5f1e46d783 100644 --- a/VECTO.sln +++ b/VECTO.sln @@ -40,8 +40,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VECTO 3", "VECTO 3", "{CC93 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCommon", "VectoCommon\VectoCommon\VectoCommon.csproj", "{79A066AD-69A9-4223-90F6-6ED5D2D084F4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication1", "ConsoleApplication1\ConsoleApplication1.csproj", "{9CB799AC-5025-4F91-9DC5-5048F59DE004}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelbasedTests", "VectoCore\ModelbasedTests\ModelbasedTests.csproj", "{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoLegacyTests", "Tools\VectoLegacyTests\VectoLegacyTests.csproj", "{49F0275A-4517-49FA-859E-77279B9C8B18}" diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj index f7504fa77e..bf14b014e8 100644 --- a/VECTO/VECTO.vbproj +++ b/VECTO/VECTO.vbproj @@ -19,10 +19,14 @@ <UpgradeBackupLocation /> <IsWebBootstrapper>false</IsWebBootstrapper> <TargetFrameworkProfile /> - <SccProjectName>SAK</SccProjectName> - <SccLocalPath>SAK</SccLocalPath> - <SccAuxPath>SAK</SccAuxPath> - <SccProvider>SAK</SccProvider> + <SccProjectName> + </SccProjectName> + <SccLocalPath> + </SccLocalPath> + <SccAuxPath> + </SccAuxPath> + <SccProvider> + </SccProvider> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <PublishUrl>C:\Users\tb28\Documents\VectoOut\</PublishUrl> <Install>true</Install> @@ -169,7 +173,7 @@ <ItemGroup> <Compile Include="ApplicationEvents.vb" /> <Compile Include="Input Files\AdvancedAuxiliary.vb" /> - <Compile Include="JSONWriter.vb" /> + <Compile Include="OutputData\JSONFileWriter.vb" /> <Compile Include="GUI\FileSignDialog.Designer.vb"> <DependentUpon>FileSignDialog.vb</DependentUpon> </Compile> @@ -256,8 +260,6 @@ <Compile Include="GUI\VectoJobForm.vb"> <SubType>Form</SubType> </Compile> - <Compile Include="OutputData\JSONFileWriter.vb" /> - <Compile Include="Plugins\PluginRegistry.vb" /> <Compile Include="VECTO_Global.vb" /> <Compile Include="VECTO_Types.vb" /> <Compile Include="GUI\GUI_Subs.vb" /> diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj index 989a904fca..5cefae0c96 100644 --- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj +++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj @@ -12,10 +12,14 @@ <MyType>Windows</MyType> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkProfile /> - <SccProjectName>SAK</SccProjectName> - <SccLocalPath>SAK</SccLocalPath> - <SccAuxPath>SAK</SccAuxPath> - <SccProvider>SAK</SccProvider> + <SccProjectName> + </SccProjectName> + <SccLocalPath> + </SccLocalPath> + <SccAuxPath> + </SccAuxPath> + <SccProvider> + </SccProvider> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj index 58f507916f..949a37358e 100644 --- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj +++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj @@ -17,10 +17,14 @@ <IsCodedUITest>False</IsCodedUITest> <TestProjectType>UnitTest</TestProjectType> <TargetFrameworkProfile /> - <SccProjectName>SAK</SccProjectName> - <SccLocalPath>SAK</SccLocalPath> - <SccAuxPath>SAK</SccAuxPath> - <SccProvider>SAK</SccProvider> + <SccProjectName> + </SccProjectName> + <SccLocalPath> + </SccLocalPath> + <SccAuxPath> + </SccAuxPath> + <SccProvider> + </SccProvider> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj b/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj index e4a61b496f..4195ff47a5 100644 --- a/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj +++ b/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj @@ -11,10 +11,14 @@ <FileAlignment>512</FileAlignment> <MyType>Windows</MyType> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <SccProjectName>SAK</SccProjectName> - <SccLocalPath>SAK</SccLocalPath> - <SccAuxPath>SAK</SccAuxPath> - <SccProvider>SAK</SccProvider> + <SccProjectName> + </SccProjectName> + <SccLocalPath> + </SccLocalPath> + <SccAuxPath> + </SccAuxPath> + <SccProvider> + </SccProvider> <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj index 84a2fd5306..9142f35b21 100644 --- a/VectoCommon/VectoCommon/VectoCommon.csproj +++ b/VectoCommon/VectoCommon/VectoCommon.csproj @@ -46,6 +46,7 @@ <ItemGroup> <Compile Include="InputData\DataSourceType.cs" /> <Compile Include="InputData\IImportPlugin.cs" /> + <Compile Include="InputData\IInputDataPlugin.cs" /> <Compile Include="InputData\TableData.cs"> <SubType>Component</SubType> </Compile> @@ -77,6 +78,7 @@ <Compile Include="Utils\EnumerableExtensionMethods.cs" /> <Compile Include="Utils\EnumHelper.cs" /> <Compile Include="Utils\IntExtensionMethods.cs" /> + <Compile Include="Utils\PluginRegistry.cs" /> <Compile Include="Utils\SI.cs" /> <Compile Include="Utils\StringExtensionMethods.cs" /> <Compile Include="Utils\Validation.cs" /> diff --git a/VectoConsole/Program.cs b/VectoConsole/Program.cs index a670734c28..38d2182cbb 100644 --- a/VectoConsole/Program.cs +++ b/VectoConsole/Program.cs @@ -36,11 +36,9 @@ using System.IO; using System.Linq; using System.Reflection; using System.Threading; -using System.Xml; using NLog; using NLog.Config; using NLog.Targets; -using TUGraz.VectoAPI.InputData; using TUGraz.VectoCommon.Models; using TUGraz.VectoCommon.Utils; using TUGraz.VectoCore.Configuration; diff --git a/VectoConsole/VectoConsole.csproj b/VectoConsole/VectoConsole.csproj index 7b92a69924..f3d8895c26 100644 --- a/VectoConsole/VectoConsole.csproj +++ b/VectoConsole/VectoConsole.csproj @@ -60,9 +60,6 @@ <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml" /> - <Reference Include="VectoAPI"> - <HintPath>..\..\VECTO_API\VectoAPI\bin\Release\VectoAPI.dll</HintPath> - </Reference> </ItemGroup> <ItemGroup> <Compile Include="Program.cs" /> @@ -110,6 +107,14 @@ </None> </ItemGroup> <ItemGroup> + <ProjectReference Include="..\..\VECTO_API\VectoAPI\VectoAPI.csproj"> + <Project>{512c2cd1-e5be-4f6b-943b-2bfa7e0cbd64}</Project> + <Name>VectoAPI</Name> + </ProjectReference> + <ProjectReference Include="..\..\VECTO_API\VectoEngineeringAPI\VectoEngineeringAPI.csproj"> + <Project>{41314a40-ab3e-4f43-b1a4-58443f4014f2}</Project> + <Name>VectoEngineeringAPI</Name> + </ProjectReference> <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj"> <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project> <Name>VectoCommon</Name> -- GitLab