Use GitVersion

dheijl · Nov 15, 2019 · 77052da · 77052da
1 parent c56c9b3
commit 77052da
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 79 deletions.
diff --git a/Gitversion.yml b/Gitversion.yml
@@ -0,0 +1,7 @@
+mode: ContinuousDeployment
+continuous-delivery-fallback-tag: ''
+assembly-informational-format: "{NuGetVersionV2}+{ShortSha}"
+assembly-file-versioning-scheme: MajorMinorPatchTag
+branches:
+  develop:
+    tag: beta
diff --git a/SWYH.sln b/SWYH.sln
@@ -1,13 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.645
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWYH", "SWYH\SWYH.csproj", "{9F7F5728-3DC1-4FA2-8D4B-F91AA3ABA754}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8695E10C-61B7-4E32-9326-6F896D493597}"
 	ProjectSection(SolutionItems) = preProject
 		CONTRIBUTING.md = CONTRIBUTING.md
+		Gitversion.yml = Gitversion.yml
 		LICENSE = LICENSE
 		README.md = README.md
 		SWYH Installer.iss = SWYH Installer.iss
@@ -107,4 +108,7 @@ Global
 		{E01B6019-ACC6-40A6-A511-48D285D51C40} = {D1A9AE0B-AAC3-402B-A9BE-42F881FCC9B8}
 		{8EA0E595-45EC-40C1-82CE-269F4FA9EBB3} = {D1A9AE0B-AAC3-402B-A9BE-42F881FCC9B8}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2367C55F-27F9-4D0D-97E6-D66076184A94}
+	EndGlobalSection
 EndGlobal
diff --git a/SWYH/Properties/AssemblyInfo.cs b/SWYH/Properties/AssemblyInfo.cs
@@ -22,58 +22,30 @@
  */
 
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
+[assembly: Guid("2ecd245f-4268-48ee-b0f1-0706ead1ba42")]
 [assembly: AssemblyTitle("Stream What You Hear")]
 [assembly: AssemblyDescription("Stream What You Hear (SWYH) is a Windows application to stream the sound from your PC to an UPnP / DLNA device")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sebastien.warin.fr")]
 [assembly: AssemblyProduct("Stream What You Hear (SWYH)")]
-[assembly: AssemblyCopyright("Copyright ©  2012-2016 Sebastien.warin.fr")]
+[assembly: AssemblyCopyright("Copyright © 2012-2019 Sebastien.warin.fr ans others")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+                                     //(used if a resource is not found in the page, 
+                                     // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+                                              //(used if a resource is not found in the page, 
+                                              // app, or any theme specific resource dictionaries)
 )]
 
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.16069.0")] // MAJOR.minor.BuildDate.Release (Si Release impaire = BETA) || http://www.epochconverter.com/epoch/daynumbers.php
-[assembly: GuidAttribute("2ecd245f-4268-48ee-b0f1-0706ead1ba42")]
+// Version 10.0 for local development
+// Automatically update by the build pipeline with GitVersion
+[assembly: AssemblyVersion("10.0.0.0")]
+[assembly: AssemblyFileVersion("10.0.0.0")]
diff --git a/SWYH/Resources/About.htm b/SWYH/Resources/About.htm
@@ -4,37 +4,36 @@
     <title>About - Stream What You Hear</title>
     <style type="text/css">
         /* CSS (c) thenoodleincident.com */
-        A:link
-        {
+        A:link {
             color: #EAEAEA;
             text-decoration: none;
         }
-        A:visited
-        {
+
+        A:visited {
             color: #EAEAEA;
             text-decoration: none;
         }
-        A:active
-        {
+
+        A:active {
             color: #ccc;
             text-decoration: none;
         }
-        A:hover
-        {
+
+        A:hover {
             color: #ccc;
             text-decoration: underline;
         }
-        body
-        {
+
+        body {
             margin: 0px 0px 0px 0px;
             padding: 0px 0px 0px 0px;
             font-family: verdana, arial, helvetica, sans-serif;
             color: #ccc;
             background-color: #333;
             text-align: center;
         }
-        #content
-        {
+
+        #content {
             width: 600px;
             padding: 10px;
             margin-top: 20px;
@@ -49,25 +48,30 @@
             voice-family: inherit;
             width: 470px;
         }
-        html > body #content
-        {
+
+        html > body #content {
             width: 470px;
         }
     </style>
 </head>
 <body>
     <div id="content">
         <h1>
-            <b>Stream What You Hear</b></h1>
+            <b>Stream What You Hear</b>
+        </h1>
         <p>
             Stream What You Hear (SWYH) is a Windows application to stream the sound from your
-            PC to an UPnP / DLNA device.</p>
+            PC to an UPnP / DLNA device.
+        </p>
         <p>
-            <a href="/stream/swyh.mp3">Start the Live Streaming (MP3)</a></p>
+            <a href="/stream/swyh.mp3">Start the Live Streaming (MP3)</a>
+        </p>
         <p>
-            For more information, visit the website : <a href="http://www.streamwhatyouhear.com">http://www.streamwhatyouhear.com</a></p>
+            For more information, visit the website : <a href="http://www.streamwhatyouhear.com">http://www.streamwhatyouhear.com</a>
+        </p>
         <h5>
-            Copyright 2012-2014 - Stream What You Hear - <a href="http://Sebastien.warin.fr">Sebastien.warin.fr</a></h5>
+            Copyright 2012-2019 - Stream What You Hear - <a href="http://Sebastien.warin.fr">Sebastien.warin.fr</a> and others
+        </h5>
     </div>
 </body>
 </html>
diff --git a/SWYH/Resources/Error404.htm b/SWYH/Resources/Error404.htm
@@ -4,64 +4,65 @@
     <title>404 - Resource not found</title>
     <style type="text/css">
         /* CSS (c) thenoodleincident.com */
-        A:link
-        {
+        A:link {
             color: #EAEAEA;
             text-decoration: none;
         }
-        A:visited
-        {
+
+        A:visited {
             color: #EAEAEA;
             text-decoration: none;
         }
-        A:active
-        {
+
+        A:active {
             color: #ccc;
             text-decoration: none;
         }
-        A:hover
-        {
+
+        A:hover {
             color: #ccc;
             text-decoration: underline;
         }
-        body
-        {
+
+        body {
             margin: 0px 0px 0px 0px;
             padding: 0px 0px 0px 0px;
             font-family: verdana, arial, helvetica, sans-serif;
             color: #ccc;
             background-color: #333;
             text-align: center;
         }
-        #content
-        {
+
+        #content {
             width: 600px;
             padding: 10px;
             margin-top: 20px;
             margin-bottom: 20px;
             margin-right: auto;
-            margin-left: auto; 
+            margin-left: auto;
             background: #666;
             border: 5px solid #ccc;
             text-align: left;
-            width: 600px; 
+            width: 600px;
             voice-family: "\"}\"";
             voice-family: inherit;
             width: 470px;
         }
-        html > body #content
-        {
-            width: 470px; 
+
+        html > body #content {
+            width: 470px;
         }
     </style>
 </head>
 <body>
     <div id="content">
         <h1>
-            <b>404 - Resource not found</b></h1>
-            <p><a href="/about/swyh.html">Go to Main page</a></p>
+            <b>404 - Resource not found</b>
+        </h1>
+        <p><a href="/about/swyh.html">Go to Main page</a></p>
         <h5>
-            Copyright 2012-2014 - Stream What You Hear - <a href="http://Sebastien.warin.fr">Sebastien.warin.fr</a></h5>
+            Copyright 2012-2019 - Stream What You Hear - <a href="http://Sebastien.warin.fr">Sebastien.warin.fr</a>  and others
+        </h5>
     </div>
 </body>
 </html>