Move NetStandard folder to normal Api folder

kamranayub · May 26, 2017 · 29da459 · 29da459
1 parent fa21be4
commit 29da459
Show file tree

Hide file tree

Showing 27 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 *.DS_Store
 
 #Visual Studio files
+.vs/
 *.[Oo]bj
 bin*/*.exe
 *.pdb

diff --git a/GiantBomb.Api.Tests/GiantBomb.Api.Tests.csproj b/GiantBomb.Api.Tests/GiantBomb.Api.Tests.csproj
@@ -78,7 +78,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\GiantBomb.Api.NetStandard\GiantBomb.Api.csproj">
+    <ProjectReference Include="..\GiantBomb.Api\GiantBomb.Api.csproj">
       <Project>{9980b512-d08b-4505-971c-6dfb5cb44e36}</Project>
       <Name>GiantBomb.Api</Name>
     </ProjectReference>

diff --git a/GiantBomb.Api.NetStandard/Core.cs → GiantBomb.Api/Core.cs b/GiantBomb.Api.NetStandard/Core.cs → GiantBomb.Api/Core.cs
diff --git a/...Bomb.Api.NetStandard/GiantBomb.Api.csproj → GiantBomb.Api/GiantBomb.Api.csproj b/...Bomb.Api.NetStandard/GiantBomb.Api.csproj → GiantBomb.Api/GiantBomb.Api.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard1.2</TargetFramework>
-    <AssemblyName>GiantBomb.Api.NetStandard</AssemblyName>
+    <AssemblyName>GiantBomb.Api</AssemblyName>
     <RootNamespace>GiantBomb.Api</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Version>2.4.0</Version>

diff --git a/...Bomb.Api.NetStandard/GiantBomb.Api.nuspec → GiantBomb.Api/GiantBomb.Api.nuspec b/...Bomb.Api.NetStandard/GiantBomb.Api.nuspec → GiantBomb.Api/GiantBomb.Api.nuspec
diff --git a/....Api.NetStandard/GiantBombApiException.cs → GiantBomb.Api/GiantBombApiException.cs b/....Api.NetStandard/GiantBombApiException.cs → GiantBomb.Api/GiantBombApiException.cs
diff --git a/....Api.NetStandard/GiantBombDeserializer.cs → GiantBomb.Api/GiantBombDeserializer.cs b/....Api.NetStandard/GiantBombDeserializer.cs → GiantBomb.Api/GiantBombDeserializer.cs
diff --git a/...Api.NetStandard/GiantBombHttpException.cs → GiantBomb.Api/GiantBombHttpException.cs b/...Api.NetStandard/GiantBombHttpException.cs → GiantBomb.Api/GiantBombHttpException.cs
diff --git a/...b.Api.NetStandard/IGiantBombRestClient.cs → GiantBomb.Api/IGiantBombRestClient.cs b/...b.Api.NetStandard/IGiantBombRestClient.cs → GiantBomb.Api/IGiantBombRestClient.cs
diff --git a/GiantBomb.Api.NetStandard/Model/Developer.cs → GiantBomb.Api/Model/Developer.cs b/GiantBomb.Api.NetStandard/Model/Developer.cs → GiantBomb.Api/Model/Developer.cs
diff --git a/GiantBomb.Api.NetStandard/Model/Franchise.cs → GiantBomb.Api/Model/Franchise.cs b/GiantBomb.Api.NetStandard/Model/Franchise.cs → GiantBomb.Api/Model/Franchise.cs
diff --git a/GiantBomb.Api.NetStandard/Model/Game.cs → GiantBomb.Api/Model/Game.cs b/GiantBomb.Api.NetStandard/Model/Game.cs → GiantBomb.Api/Model/Game.cs
diff --git a/GiantBomb.Api.NetStandard/Model/Genre.cs → GiantBomb.Api/Model/Genre.cs b/GiantBomb.Api.NetStandard/Model/Genre.cs → GiantBomb.Api/Model/Genre.cs
diff --git a/...mb.Api.NetStandard/Model/GiantBombBase.cs → GiantBomb.Api/Model/GiantBombBase.cs b/...mb.Api.NetStandard/Model/GiantBombBase.cs → GiantBomb.Api/Model/GiantBombBase.cs
diff --git a/GiantBomb.Api.NetStandard/Model/Image.cs → GiantBomb.Api/Model/Image.cs b/GiantBomb.Api.NetStandard/Model/Image.cs → GiantBomb.Api/Model/Image.cs
diff --git a/GiantBomb.Api.NetStandard/Model/Platform.cs → GiantBomb.Api/Model/Platform.cs b/GiantBomb.Api.NetStandard/Model/Platform.cs → GiantBomb.Api/Model/Platform.cs
diff --git a/GiantBomb.Api.NetStandard/Model/Publisher.cs → GiantBomb.Api/Model/Publisher.cs b/GiantBomb.Api.NetStandard/Model/Publisher.cs → GiantBomb.Api/Model/Publisher.cs
diff --git a/GiantBomb.Api.NetStandard/Model/Rating.cs → GiantBomb.Api/Model/Rating.cs b/GiantBomb.Api.NetStandard/Model/Rating.cs → GiantBomb.Api/Model/Rating.cs
diff --git a/GiantBomb.Api.NetStandard/Model/Region.cs → GiantBomb.Api/Model/Region.cs b/GiantBomb.Api.NetStandard/Model/Region.cs → GiantBomb.Api/Model/Region.cs
diff --git a/GiantBomb.Api.NetStandard/Model/Release.cs → GiantBomb.Api/Model/Release.cs b/GiantBomb.Api.NetStandard/Model/Release.cs → GiantBomb.Api/Model/Release.cs
diff --git a/GiantBomb.Api.NetStandard/ResourceTypes.cs → GiantBomb.Api/ResourceTypes.cs b/GiantBomb.Api.NetStandard/ResourceTypes.cs → GiantBomb.Api/ResourceTypes.cs
diff --git a/GiantBomb.Api.NetStandard/Resources/Games.cs → GiantBomb.Api/Resources/Games.cs b/GiantBomb.Api.NetStandard/Resources/Games.cs → GiantBomb.Api/Resources/Games.cs
diff --git a/...mb.Api.NetStandard/Resources/Platforms.cs → GiantBomb.Api/Resources/Platforms.cs b/...mb.Api.NetStandard/Resources/Platforms.cs → GiantBomb.Api/Resources/Platforms.cs
diff --git a/...Bomb.Api.NetStandard/Resources/Regions.cs → GiantBomb.Api/Resources/Regions.cs b/...Bomb.Api.NetStandard/Resources/Regions.cs → GiantBomb.Api/Resources/Regions.cs
diff --git a/...omb.Api.NetStandard/Resources/Releases.cs → GiantBomb.Api/Resources/Releases.cs b/...omb.Api.NetStandard/Resources/Releases.cs → GiantBomb.Api/Resources/Releases.cs
diff --git a/...tBomb.Api.NetStandard/Resources/Search.cs → GiantBomb.Api/Resources/Search.cs b/...tBomb.Api.NetStandard/Resources/Search.cs → GiantBomb.Api/Resources/Search.cs
diff --git a/GiantBomb.sln b/GiantBomb.sln
@@ -7,6 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GiantBomb.Api.Tests", "Gian
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4851769F-6AF7-484A-88BE-52F7478878B9}"
 	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
 		LICENSE.txt = LICENSE.txt
 		Readme.md = Readme.md
 	EndProjectSection
@@ -17,7 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{9DBE19
 		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GiantBomb.Api", "GiantBomb.Api.NetStandard\GiantBomb.Api.csproj", "{9980B512-D08B-4505-971C-6DFB5CB44E36}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GiantBomb.Api", "GiantBomb.Api\GiantBomb.Api.csproj", "{9980B512-D08B-4505-971C-6DFB5CB44E36}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution