Merge branch 'hotfix/remove-double-resources'

svenkle · Apr 30, 2017 · 8bc7697 · 8bc7697
2 parents 87d1fb8 + 3d2acfe
commit 8bc7697
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 209 deletions.
diff --git a/build/Svenkle NuGet Server.aip b/build/Svenkle NuGet Server.aip
@@ -13,7 +13,7 @@
     <ROW Property="ProductCode" Value="1033:{5DB62BA4-A6EB-48D1-8C88-8A5B86609634} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="NuGet Server"/>
-    <ROW Property="ProductVersion" Value="0.0.6330.3654" Type="32" TargetFile="Svenkle.NuGetServer.Service.exe"/>
+    <ROW Property="ProductVersion" Value="0.0.6330.3877" Type="32" TargetFile="Svenkle.NuGetServer.Service.exe"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{4C12923C-88E2-4863-A671-5C5E511357AF}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

diff --git a/src/Svenkle.NuGetServer.Service/Resources.Designer.cs b/src/Svenkle.NuGetServer.Service/Resources.Designer.cs
diff --git a/src/Svenkle.NuGetServer.Service/Resources.resx b/src/Svenkle.NuGetServer.Service/Resources.resx
diff --git a/src/Svenkle.NuGetServer.Service/Svenkle.NuGetServer.Service.csproj b/src/Svenkle.NuGetServer.Service/Svenkle.NuGetServer.Service.csproj
@@ -56,11 +56,6 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config">
@@ -73,12 +68,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.