Fixed versioning options

UnclePetros · Mar 9, 2020 · 3017443 · 3017443
1 parent 05b370d
commit 3017443
Showing 5 changed files with 34 additions and 12 deletions.
diff --git a/App.config b/App.config
@@ -17,10 +17,23 @@
     You should have received a copy of the GNU General Public License
     along with OriFlagTess.  If not, see<http://www.gnu.org/licenses/> -->
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
-    </startup>
-    <appSettings>
-      <add key="maxPleat" value="8"/>
-    </appSettings>
-</configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
+  <appSettings>
+    <add key="maxPleat" value="8" />
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
+  </appSettings>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>
diff --git a/Main.xaml b/Main.xaml
@@ -23,6 +23,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:System="clr-namespace:System;assembly=mscorlib"  x:Class="Flagstone_Tessellation___Molecule_construction.Main"
         mc:Ignorable="d"
+        x:Name="mainWindow"
         Title="OriFlagTess :: Molecule construction" ResizeMode="NoResize" SizeToContent="WidthAndHeight" 
         WindowStartupLocation="CenterScreen">
     <Grid x:Name="mainGrid" Margin="30">

diff --git a/Main.xaml.cs b/Main.xaml.cs
@@ -50,9 +50,17 @@ public partial class Main : Window
         public Main()
         {
             NameScope.SetNameScope(this, new NameScope());
+
             InitializeComponent();
             InitUI(4); //Initialize UI with a 4-pleat molecule
 
+            int vMajor = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Major;
+            int vMinor = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Minor;
+            //DateTime buildDate = new DateTime(2000, 1, 1)
+            //                        .AddDays(version.Build).AddSeconds(version.Revision * 2);
+            string displayableVersion = $"{vMajor}.{vMinor}";
+            this.mainWindow.Title += " :: v"+displayableVersion;
+
             //Node View initialization
             this.inputNodeCanvas.ClipToBounds = true;
             this.inputNodeCanvas.Background = new SolidColorBrush(Colors.Beige);

diff --git a/OriFlagTess.csproj b/OriFlagTess.csproj
@@ -13,7 +13,9 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -26,10 +28,8 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -60,6 +60,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -51,5 +51,4 @@
 // 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: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.3.*")]