Move things around

Author: shana

.gitignore

@@ -238,5 +238,4 @@ WiX.Toolset.DummyFile.txt
 nunit-UnitTests.xml
 nunit-TrackingCollectionTests.xml
 GitHubVS.sln.DotSettings
-src/GitHub.Exports/Settings/IPackageSettings.cs
-src/GitHub.VisualStudio/Settings/PackageSettingsGen.cs
+**/generated/*.cs

src/GitHub.Exports/GitHub.Exports.csproj

@@ -138,7 +138,7 @@
   <ItemGroup>
     <Compile Include="Authentication\AuthenticationResultExtensions.cs" />
     <Compile Include="Extensions\ServiceProviderExtensions.cs" />
-    <Compile Include="Settings\IPackageSettings.cs">
+    <Compile Include="Settings\generated\IPackageSettings.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>IPackageSettings.tt</DependentUpon>
@@ -188,7 +188,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Settings\IPackageSettings.tt">
+    <Content Include="Settings\generated\IPackageSettings.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>IPackageSettings.cs</LastGenOutput>
     </Content>
@@ -199,7 +199,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\src\common\t4.targets" />
   <Import Project="$(SolutionDir)\lib\Microsoft.TextTemplating.targets" />
-
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

src/GitHub.Exports/Settings/IPackageSettings.tt renamed to src/GitHub.Exports/Settings/generated/IPackageSettings.tt

@@ -8,12 +8,12 @@
 <#@ import namespace="Newtonsoft.Json.Linq" #>
 <#@ output extension=".cs" #>
 <#
-var file = this.Host.ResolvePath(@"..\..\common\settings.json");
+var file = this.Host.ResolvePath(@"..\..\..\common\settings.json");
 var json = JObject.Parse(File.ReadAllText(file));
 #>
 // This is an automatically generated file, based on settings.json and PackageSettingsGen.tt
 /* settings.json content:
-<#@ include file="..\..\common\settings.json" #>
+<#@ include file="..\..\..\common\settings.json" #>
 */
 namespace GitHub.Settings
 {

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

@@ -250,10 +250,10 @@
     <Compile Include="Services\Program.cs" />
     <Compile Include="Services\SharedResources.cs" />
     <Compile Include="Settings\PackageSettings.cs" />
-    <Compile Include="Settings\PackageSettingsGen.cs">
+    <Compile Include="Settings\generated\PackageSettings.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>PackageSettingsGen.tt</DependentUpon>
+      <DependentUpon>PackageSettings.tt</DependentUpon>
     </Compile>
     <Compile Include="Settings\Settings.cs" />
     <Compile Include="Base\PackageBase.cs" />
@@ -345,9 +345,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Settings\PackageSettingsGen.tt">
+    <Content Include="Settings\generated\PackageSettings.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>PackageSettingsGen.cs</LastGenOutput>
       <CustomToolNamespace>GitHub.VisualStudio.Settings</CustomToolNamespace>
     </Content>
     <None Include="packages.config">

src/GitHub.VisualStudio/Settings/PackageSettingsGen.tt renamed to src/GitHub.VisualStudio/Settings/generated/PackageSettings.tt

@@ -7,12 +7,12 @@
 <#@ import namespace="Newtonsoft.Json.Linq" #>
 <#@ output extension=".cs" #>
 <#
-var file = this.Host.ResolvePath(@"..\..\common\settings.json");
+var file = this.Host.ResolvePath(@"..\..\..\common\settings.json");
 var json = JObject.Parse(File.ReadAllText(file));
 #>
 // This is an automatically generated file, based on settings.json and PackageSettingsGen.tt
 /* settings.json content:
-<#@ include file="..\..\common\settings.json" #>
+<#@ include file="..\..\..\common\settings.json" #>
 */
 
 using GitHub.Settings;