Update to .net 4.8 & release

BlythMeister · Jun 10, 2020 · 7b797a0 · 7b797a0
1 parent 2ef6a81
commit 7b797a0
Show file tree

Hide file tree

Showing 30 changed files with 12,239 additions and 100 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -19,7 +19,7 @@ skip_commits:
     - docs/*
     - '**/*.html'
     - '**/*.md'
-version: '3.18.1.{build}'
+version: '3.19.0.{build}'
 skip_tags: true
 image: Visual Studio 2019
 clone_folder: c:\project\gallifrey

diff --git a/paket.dependencies b/paket.dependencies
@@ -1,10 +1,9 @@
-source https://www.nuget.org/api/v2
-framework: auto-detect
+source https://api.nuget.org/v3/index.json
 
 nuget Exceptionless.Wpf
 nuget FAKE ~> 4
-nuget MahApps.Metro prerelease
-nuget MahApps.Metro.IconPacks.FontAwesome prerelease
+nuget MahApps.Metro
+nuget MahApps.Metro.IconPacks.FontAwesome
 nuget Newtonsoft.Json
 nuget Octokit
 nuget RestSharp

diff --git a/paket.lock b/paket.lock
diff --git a/src/Gallifrey.Jira/Gallifrey.Jira.csproj b/src/Gallifrey.Jira/Gallifrey.Jira.csproj
diff --git a/src/Gallifrey.Rest/Gallifrey.Rest.csproj b/src/Gallifrey.Rest/Gallifrey.Rest.csproj
diff --git a/src/Gallifrey.UI.Modern.Alpha/App.xaml b/src/Gallifrey.UI.Modern.Alpha/App.xaml
@@ -8,7 +8,6 @@
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Blue.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.FontAwesome;component/Themes/PackIconFontAwesome.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>

diff --git a/src/Gallifrey.UI.Modern.Alpha/Gallifrey.UI.Modern.Alpha.csproj b/src/Gallifrey.UI.Modern.Alpha/Gallifrey.UI.Modern.Alpha.csproj
diff --git a/src/Gallifrey.UI.Modern.Alpha/Properties/Resources.Designer.cs b/src/Gallifrey.UI.Modern.Alpha/Properties/Resources.Designer.cs
diff --git a/src/Gallifrey.UI.Modern.Alpha/Properties/Settings.Designer.cs b/src/Gallifrey.UI.Modern.Alpha/Properties/Settings.Designer.cs
diff --git a/src/Gallifrey.UI.Modern.Alpha/app.config b/src/Gallifrey.UI.Modern.Alpha/app.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <system.net>
-    <defaultProxy enabled="true" useDefaultCredentials="true" />
+    <defaultProxy enabled="true" useDefaultCredentials="true"/>
   </system.net>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
 </configuration>
diff --git a/src/Gallifrey.UI.Modern.Beta/App.xaml b/src/Gallifrey.UI.Modern.Beta/App.xaml
@@ -8,7 +8,6 @@
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Blue.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.FontAwesome;component/Themes/PackIconFontAwesome.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>