Merge pull request #14 from m-tmatma/feature/RemoveSharedProject

m-tmatma · web-flow · commit 33b482a08cac · 2018-04-10T23:15:23.000+09:00
remove shared project
diff --git a/.gitignore b/.gitignore
@@ -258,4 +258,5 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc
+/UnitTests/Utility
diff --git a/CreateGUIDVSPlugin.sln b/CreateGUIDVSPlugin.sln
@@ -5,16 +5,9 @@ VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreateGUIDVSPlugin", "CreateGUIDVSPlugin\CreateGUIDVSPlugin.csproj", "{94C76B70-7128-482C-A28A-5D08DD03EC03}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "GuidTools", "GuidTools\GuidTools.shproj", "{28706D78-2119-43C4-B127-FE223516B8F8}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{254E10B0-3326-4DDC-9974-B11C75809641}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		GuidTools\GuidTools.projitems*{254e10b0-3326-4ddc-9974-b11c75809641}*SharedItemsImports = 4
-		GuidTools\GuidTools.projitems*{28706d78-2119-43c4-b127-fe223516b8f8}*SharedItemsImports = 13
-		GuidTools\GuidTools.projitems*{94c76b70-7128-482c-a28a-5d08dd03ec03}*SharedItemsImports = 4
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
diff --git a/CreateGUIDVSPlugin/CopyGuidCommand.cs b/CreateGUIDVSPlugin/CopyGuidCommand.cs
@@ -5,7 +5,7 @@
 using System.Windows.Forms;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using GuidTools;
+using CreateGUIDVSPlugin.Utility;
 
 namespace CreateGUIDVSPlugin
 {
diff --git a/CreateGUIDVSPlugin/CreateGUIDVSPlugin.csproj b/CreateGUIDVSPlugin/CreateGUIDVSPlugin.csproj
@@ -67,6 +67,10 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RenewGuidCommand.cs" />
+    <Compile Include="Utility\Configuration.cs" />
+    <Compile Include="Utility\FormatGuid.cs" />
+    <Compile Include="Utility\ReplaceWithNewGuid.cs" />
+    <Compile Include="Utility\Template.cs" />
     <Compile Include="VSPackage.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -212,10 +216,10 @@
       <ManifestResourceName>VSPackage</ManifestResourceName>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.10\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.10\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
-  <Import Project="..\GuidTools\GuidTools.projitems" Label="Shared" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/CreateGUIDVSPlugin/InsertGuidCommand.cs b/CreateGUIDVSPlugin/InsertGuidCommand.cs
@@ -5,7 +5,7 @@
 using System.Windows.Forms;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using GuidTools;
+using CreateGUIDVSPlugin.Utility;
 
 namespace CreateGUIDVSPlugin
 {
diff --git a/CreateGUIDVSPlugin/OptionsControl.cs b/CreateGUIDVSPlugin/OptionsControl.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using GuidTools;
+using CreateGUIDVSPlugin.Utility;
 
 namespace CreateGUIDVSPlugin
 {
diff --git a/CreateGUIDVSPlugin/RenewGuidCommand.cs b/CreateGUIDVSPlugin/RenewGuidCommand.cs
@@ -3,7 +3,7 @@
 using System.Globalization;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using GuidTools;
+using CreateGUIDVSPlugin.Utility;
 
 namespace CreateGUIDVSPlugin
 {
diff --git a/CreateGUIDVSPlugin/Utility/Configuration.cs b/CreateGUIDVSPlugin/Utility/Configuration.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using Microsoft.Win32;
 
-namespace GuidTools
+namespace CreateGUIDVSPlugin.Utility
 {
     /// <summary>
     /// Configuration and setting manager
diff --git a/CreateGUIDVSPlugin/Utility/FormatGuid.cs b/CreateGUIDVSPlugin/Utility/FormatGuid.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace GuidTools
+namespace CreateGUIDVSPlugin.Utility
 {
     /// <summary>
     /// GUID formatter
diff --git a/CreateGUIDVSPlugin/Utility/ReplaceWithNewGuid.cs b/CreateGUIDVSPlugin/Utility/ReplaceWithNewGuid.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace GuidTools
+namespace CreateGUIDVSPlugin.Utility
 {
     public class ReplaceWithNewGuid
     {
diff --git a/CreateGUIDVSPlugin/Utility/Template.cs b/CreateGUIDVSPlugin/Utility/Template.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace GuidTools
+namespace CreateGUIDVSPlugin.Utility
 {
     /// <summary>
     /// Manager for Variable Name, Description, and Regular Expressioin
diff --git a/CreateGUIDVSPlugin/VSPackage.cs b/CreateGUIDVSPlugin/VSPackage.cs
@@ -15,7 +15,7 @@
 using Microsoft.VisualStudio.Editor;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.TextManager.Interop;
-using GuidTools;
+using CreateGUIDVSPlugin.Utility;
 
 namespace CreateGUIDVSPlugin
 {
diff --git a/GuidTools/GuidTools.projitems b/GuidTools/GuidTools.projitems
diff --git a/GuidTools/GuidTools.shproj b/GuidTools/GuidTools.shproj
diff --git a/UnitTests/MultipleFormat.cs b/UnitTests/MultipleFormat.cs
@@ -8,7 +8,7 @@ namespace UnitTests
     using System;
     using System.Text;
     using NUnit.Framework;
-    using GuidTools;
+    using CreateGUIDVSPlugin.Utility;
 
     /// <summary>
     /// unit test for ReplaceWithNewGuid
diff --git a/UnitTests/StaticPattern.cs b/UnitTests/StaticPattern.cs
@@ -8,7 +8,7 @@ namespace UnitTests
     using System;
     using System.Text;
     using NUnit.Framework;
-    using GuidTools;
+    using CreateGUIDVSPlugin.Utility;
 
     /// <summary>
     /// unit test for ReplaceWithNewGuid
diff --git a/UnitTests/TestConfiguration.cs b/UnitTests/TestConfiguration.cs
@@ -9,7 +9,7 @@ namespace Unittest
     using System.Text;
     using Microsoft.Win32;
     using NUnit.Framework;
-    using GuidTools;
+    using CreateGUIDVSPlugin.Utility;
 
     /// <summary>
     /// unit test for Configuration
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
@@ -47,6 +47,18 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\CreateGUIDVSPlugin\Utility\Configuration.cs">
+      <Link>Utility\Configuration.cs</Link>
+    </Compile>
+    <Compile Include="..\CreateGUIDVSPlugin\Utility\FormatGuid.cs">
+      <Link>Utility\FormatGuid.cs</Link>
+    </Compile>
+    <Compile Include="..\CreateGUIDVSPlugin\Utility\ReplaceWithNewGuid.cs">
+      <Link>Utility\ReplaceWithNewGuid.cs</Link>
+    </Compile>
+    <Compile Include="..\CreateGUIDVSPlugin\Utility\Template.cs">
+      <Link>Utility\Template.cs</Link>
+    </Compile>
     <Compile Include="GuidGenerater.cs" />
     <Compile Include="MultipleFormat.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -59,8 +71,8 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\GuidTools\GuidTools.projitems" Label="Shared" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System.Windows.Forms;`
`6`	`6`	`using Microsoft.VisualStudio.Shell;`
`7`	`7`	`using Microsoft.VisualStudio.Shell.Interop;`
`8`		`-using GuidTools;`
	`8`	`+using CreateGUIDVSPlugin.Utility;`
`9`	`9`
`10`	`10`	`namespace CreateGUIDVSPlugin`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using System.Text;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`	`using System.Windows.Forms;`
`10`		`-using GuidTools;`
	`10`	`+using CreateGUIDVSPlugin.Utility;`
`11`	`11`
`12`	`12`	`namespace CreateGUIDVSPlugin`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Globalization;`
`4`	`4`	`using Microsoft.VisualStudio.Shell;`
`5`	`5`	`using Microsoft.VisualStudio.Shell.Interop;`
`6`		`-using GuidTools;`
	`6`	`+using CreateGUIDVSPlugin.Utility;`
`7`	`7`
`8`	`8`	`namespace CreateGUIDVSPlugin`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Reflection;`
`4`	`4`	`using Microsoft.Win32;`
`5`	`5`
`6`		`-namespace GuidTools`
	`6`	`+namespace CreateGUIDVSPlugin.Utility`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Configuration and setting manager`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace GuidTools`
	`3`	`+namespace CreateGUIDVSPlugin.Utility`
`4`	`4`	`{`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// GUID formatter`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Text;`
`4`	`4`	`using System.Text.RegularExpressions;`
`5`	`5`
`6`		`-namespace GuidTools`
	`6`	`+namespace CreateGUIDVSPlugin.Utility`
`7`	`7`	`{`
`8`	`8`	`public class ReplaceWithNewGuid`
`9`	`9`	`{`