Changed assembly info to use Automatic Versions vor versioning.

Hyrules · Aug 30, 2017 · 1ba7487 · 1ba7487
1 parent 7d5ca55
commit 1ba7487
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 8 deletions.
diff --git a/HueLib2Test/HueLib2Test.csproj b/HueLib2Test/HueLib2Test.csproj
@@ -98,6 +98,11 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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">

diff --git a/HueLib2Test/Properties/AssemblyInfo.cs b/HueLib2Test/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/WinHue3/App.xaml.cs b/WinHue3/App.xaml.cs
@@ -39,8 +39,6 @@ public App()
             }
         }
 
-        public string AssemblyVersion { get; private set; }
-
         private void Application_Startup(object sender, StartupEventArgs e)
         {
             Log.Info($@"WinHue {Assembly.GetExecutingAssembly().GetName().Version.ToString()} started");

diff --git a/WinHue3/Properties/AssemblyInfo.cs b/WinHue3/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut 
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.*")]
-//[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+//[assembly: AssemblyFileVersion("3.0.*")]
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = "log4net.config", Watch = true)]
diff --git a/WinHue3/WinHue3.csproj b/WinHue3/WinHue3.csproj
@@ -29,6 +29,12 @@
     <ApplicationVersion>3.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <ShouldCreateLogs>True</ShouldCreateLogs>
+    <AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
+    <UpdateAssemblyVersion>True</UpdateAssemblyVersion>
+    <UpdateAssemblyFileVersion>False</UpdateAssemblyFileVersion>
+    <UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
+    <AssemblyVersionSettings>None.None.Increment.None</AssemblyVersionSettings>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -804,7 +810,11 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ProjectExtensions />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="..\..\..\..\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.None" />
+    </VisualStudio>
+  </ProjectExtensions>
   <PropertyGroup>
     <PostBuildEvent>xcopy "$(SolutionDir)lights" "$(TargetDir)lights" /e /y</PostBuildEvent>
   </PropertyGroup>

diff --git a/WinHue3_1.sln b/WinHue3_1.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.8
+VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinHue3", "WinHue3\WinHue3.csproj", "{E08F8332-0232-47BC-A7D7-212F49296577}"
 EndProject
@@ -41,7 +41,8 @@ Global
 		{5FC27AAC-E748-41BE-81F0-D2842D9925B4} = {383AF157-5558-4EE8-8B8D-9A904C4F5FB0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		VisualSVNWorkingCopyRoot = .
+		BuildVersion_StartDate = 2000/1/1
 		SolutionGuid = {F7AF3748-36F5-46A1-AFE9-F9272BC23765}
+		VisualSVNWorkingCopyRoot = .
 	EndGlobalSection
 EndGlobal
diff --git a/whc/whc.csproj b/whc/whc.csproj
@@ -107,6 +107,11 @@
     <Content Include="icon.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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">
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,8 +39,6 @@ public App() @@
                 }
             }
-            public string AssemblyVersion { get; private set; }
             private void Application_Startup(object sender, StartupEventArgs e)
             {
                 Log.Info($@"WinHue {Assembly.GetExecutingAssembly().GetName().Version.ToString()} started");
@@ Expand Down @@