Skip to content

remove shared project #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 10, 2018
Merged

remove shared project #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14dfa54
remove the shared project 'GuidTools'.
m-tmatma Apr 10, 2018
7d3c0c9
add .gitignore to Utility folder.
m-tmatma Apr 10, 2018
5bbf11b
change namespace GuidTools to CreateGUIDVSPlugin.Utility
m-tmatma Apr 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,5 @@ paket-files/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
*.pyc
/UnitTests/Utility
7 changes: 0 additions & 7 deletions CreateGUIDVSPlugin.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CreateGUIDVSPlugin/CopyGuidCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Windows.Forms;
using Microsoft.VisualStudio.Shell;
using Microsoft.VisualStudio.Shell.Interop;
using GuidTools;
using CreateGUIDVSPlugin.Utility;

namespace CreateGUIDVSPlugin
{
Expand Down
6 changes: 5 additions & 1 deletion CreateGUIDVSPlugin/CreateGUIDVSPlugin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion CreateGUIDVSPlugin/InsertGuidCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Windows.Forms;
using Microsoft.VisualStudio.Shell;
using Microsoft.VisualStudio.Shell.Interop;
using GuidTools;
using CreateGUIDVSPlugin.Utility;

namespace CreateGUIDVSPlugin
{
Expand Down
2 changes: 1 addition & 1 deletion CreateGUIDVSPlugin/OptionsControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using GuidTools;
using CreateGUIDVSPlugin.Utility;

namespace CreateGUIDVSPlugin
{
Expand Down
2 changes: 1 addition & 1 deletion CreateGUIDVSPlugin/RenewGuidCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Globalization;
using Microsoft.VisualStudio.Shell;
using Microsoft.VisualStudio.Shell.Interop;
using GuidTools;
using CreateGUIDVSPlugin.Utility;

namespace CreateGUIDVSPlugin
{
Expand Down
2 changes: 1 addition & 1 deletion GuidTools/Configuration.cs → CreateGUIDVSPlugin/Utility/Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Reflection;
using Microsoft.Win32;

namespace GuidTools
namespace CreateGUIDVSPlugin.Utility
{
/// <summary>
/// Configuration and setting manager
Expand Down
2 changes: 1 addition & 1 deletion GuidTools/FormatGuid.cs → CreateGUIDVSPlugin/Utility/FormatGuid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace GuidTools
namespace CreateGUIDVSPlugin.Utility
{
/// <summary>
/// GUID formatter
Expand Down
2 changes: 1 addition & 1 deletion GuidTools/ReplaceWithNewGuid.cs → ...UIDVSPlugin/Utility/ReplaceWithNewGuid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Text;
using System.Text.RegularExpressions;

namespace GuidTools
namespace CreateGUIDVSPlugin.Utility
{
public class ReplaceWithNewGuid
{
Expand Down
2 changes: 1 addition & 1 deletion GuidTools/Template.cs → CreateGUIDVSPlugin/Utility/Template.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CreateGUIDVSPlugin/VSPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
17 changes: 0 additions & 17 deletions GuidTools/GuidTools.projitems
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions GuidTools/GuidTools.shproj
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion UnitTests/MultipleFormat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace UnitTests
using System;
using System.Text;
using NUnit.Framework;
using GuidTools;
using CreateGUIDVSPlugin.Utility;

/// <summary>
/// unit test for ReplaceWithNewGuid
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/StaticPattern.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace UnitTests
using System;
using System.Text;
using NUnit.Framework;
using GuidTools;
using CreateGUIDVSPlugin.Utility;

/// <summary>
/// unit test for ReplaceWithNewGuid
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/TestConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 13 additions & 1 deletion UnitTests/UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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>
Expand Down