Refactored build for resources

alexsiilvaa · Jan 5, 2018 · 8a68c56 · 8a68c56
1 parent 3b6d4e1
commit 8a68c56
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 92 deletions.
diff --git a/ApiVersioning.sln b/ApiVersioning.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2006
+VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4D5F5F21-0CB7-4B4E-A42F-732BD4AFD0FF}"
 	ProjectSection(SolutionItems) = preProject
@@ -105,6 +105,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{2BB57808
 		build\file-version.targets = build\file-version.targets
 		build\nuget.props = build\nuget.props
 		build\nuget.targets = build\nuget.targets
+		build\resource.targets = build\resource.targets
 		build\signing.props = build\signing.props
 	EndProjectSection
 EndProject

diff --git a/build/resource.targets b/build/resource.targets
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <ItemGroup>
+  <Compile Update="*.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="$([System.IO.Path]::GetFileNameWithoutExtension('%(Filename)')).resx" />
+ </ItemGroup>
+
+ <ItemGroup>
+  <EmbeddedResource Update="*.resx" Generator="ResXFileCodeGenerator" LastGenOutput="%(Filename).Designer.cs" />
+ </ItemGroup>
+
+</Project>
diff --git a/....AspNet.OData.Versioning.ApiExplorer/Microsoft.AspNet.OData.Versioning.ApiExplorer.csproj b/....AspNet.OData.Versioning.ApiExplorer/Microsoft.AspNet.OData.Versioning.ApiExplorer.csproj
@@ -25,21 +25,6 @@
   <Reference Include="Microsoft.CSharp" />
  </ItemGroup>
 
- <ItemGroup>
-   <Compile Update="SR.Designer.cs">
-     <DesignTime>True</DesignTime>
-     <AutoGen>True</AutoGen>
-     <DependentUpon>SR.resx</DependentUpon>
-   </Compile>
- </ItemGroup>
-
- <ItemGroup>
-   <EmbeddedResource Update="SR.resx">
-     <Generator>ResXFileCodeGenerator</Generator>
-     <LastGenOutput>SR.Designer.cs</LastGenOutput>
-   </EmbeddedResource>
- </ItemGroup>
-
  <Import Project="..\Shared\Shared.projitems" Label="Shared" />
 
 </Project>
diff --git a/src/Microsoft.AspNet.OData.Versioning/Microsoft.AspNet.OData.Versioning.csproj b/src/Microsoft.AspNet.OData.Versioning/Microsoft.AspNet.OData.Versioning.csproj
@@ -27,21 +27,6 @@
   <Reference Include="Microsoft.CSharp" />
  </ItemGroup>
 
- <ItemGroup>
-   <Compile Update="SR.Designer.cs">
-     <DependentUpon>SR.resx</DependentUpon>
-     <DesignTime>True</DesignTime>
-     <AutoGen>True</AutoGen>
-   </Compile>
- </ItemGroup>
-
- <ItemGroup>
-   <EmbeddedResource Update="SR.resx">
-     <LastGenOutput>SR.Designer.cs</LastGenOutput>
-     <Generator>ResXFileCodeGenerator</Generator>
-   </EmbeddedResource>
- </ItemGroup>
-
  <Import Project="..\Shared\Shared.projitems" Label="Shared" />
 
 </Project>
diff --git a/...spNet.WebApi.Versioning.ApiExplorer/Microsoft.AspNet.WebApi.Versioning.ApiExplorer.csproj b/...spNet.WebApi.Versioning.ApiExplorer/Microsoft.AspNet.WebApi.Versioning.ApiExplorer.csproj
@@ -28,21 +28,6 @@
   <Reference Include="Microsoft.CSharp" />
  </ItemGroup>
 
- <ItemGroup>
-   <Compile Update="LocalSR.Designer.cs">
-     <DesignTime>True</DesignTime>
-     <AutoGen>True</AutoGen>
-     <DependentUpon>LocalSR.resx</DependentUpon>
-   </Compile>
- </ItemGroup>
-
- <ItemGroup>
-   <EmbeddedResource Update="LocalSR.resx">
-     <Generator>ResXFileCodeGenerator</Generator>
-     <LastGenOutput>LocalSR.Designer.cs</LastGenOutput>
-   </EmbeddedResource>
- </ItemGroup>
-
  <Import Project="..\Common.ApiExplorer\Common.ApiExplorer.projitems" Label="Shared" />
 
 </Project>
diff --git a/src/Microsoft.AspNet.WebApi.Versioning/Microsoft.AspNet.WebApi.Versioning.csproj b/src/Microsoft.AspNet.WebApi.Versioning/Microsoft.AspNet.WebApi.Versioning.csproj
@@ -24,21 +24,6 @@
   <Reference Include="Microsoft.CSharp" />
  </ItemGroup>
 
- <ItemGroup>
-  <Compile Update="SR.Designer.cs">
-   <DesignTime>True</DesignTime>
-   <AutoGen>True</AutoGen>
-   <DependentUpon>SR.resx</DependentUpon>
-  </Compile>
- </ItemGroup>
-
- <ItemGroup>
-  <EmbeddedResource Update="SR.resx">
-   <Generator>ResXFileCodeGenerator</Generator>
-   <LastGenOutput>SR.Designer.cs</LastGenOutput>
-  </EmbeddedResource>
- </ItemGroup>
-
  <Import Project="..\Common\Common.projitems" Label="Shared" />
  <Import Project="..\Shared\Shared.projitems" Label="Shared" />
 

diff --git a/...NetCore.Mvc.Versioning.ApiExplorer/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer.csproj b/...NetCore.Mvc.Versioning.ApiExplorer/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer.csproj
@@ -24,21 +24,6 @@
   <PackageReference Include="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.0.0" />
  </ItemGroup>
 
- <ItemGroup>
-   <Compile Update="SR.Designer.cs">
-     <DesignTime>True</DesignTime>
-     <AutoGen>True</AutoGen>
-     <DependentUpon>SR.resx</DependentUpon>
-   </Compile>
- </ItemGroup>
-
- <ItemGroup>
-   <EmbeddedResource Update="SR.resx">
-     <Generator>ResXFileCodeGenerator</Generator>
-     <LastGenOutput>SR.Designer.cs</LastGenOutput>
-   </EmbeddedResource>
- </ItemGroup>
-
  <Import Project="..\Shared\Shared.projitems" Label="Shared" />
  <Import Project="..\Common.ApiExplorer\Common.ApiExplorer.projitems" Label="Shared" />
 

diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Microsoft.AspNetCore.Mvc.Versioning.csproj b/src/Microsoft.AspNetCore.Mvc.Versioning/Microsoft.AspNetCore.Mvc.Versioning.csproj
@@ -20,21 +20,6 @@
   <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.0" />
  </ItemGroup>
 
- <ItemGroup>
-  <Compile Update="SR.Designer.cs">
-   <DesignTime>True</DesignTime>
-   <AutoGen>True</AutoGen>
-   <DependentUpon>SR.resx</DependentUpon>
-  </Compile>
- </ItemGroup>
-
- <ItemGroup>
-  <EmbeddedResource Update="SR.resx">
-   <Generator>ResXFileCodeGenerator</Generator>
-   <LastGenOutput>SR.Designer.cs</LastGenOutput>
-  </EmbeddedResource>
- </ItemGroup>
-
  <Import Project="..\Common\Common.projitems" Label="Shared" />
  <Import Project="..\Shared\Shared.projitems" Label="Shared" />
 

diff --git a/src/directory.build.targets b/src/directory.build.targets
@@ -6,8 +6,9 @@
   </PropertyGroup>
 
   <ImportGroup Condition=" '$(MSBuildProjectExtension)' != '.shproj' ">
+    <Import Project="..\build\resource.targets" />
     <Import Project="..\build\file-version.targets" />
     <Import Project="..\build\nuget.targets" />
   </ImportGroup>
-  
+
 </Project>