Add support for per-feed user agent

Remove extra restore now that config is fixed
Branch and config updates
2026-01-14 01:25:38 -05:00 · 2023-06-15 17:28:38 -04:00 · 2023-04-29 19:06:58 -04:00 · 2023-04-29 19:03:25 -04:00 · 2023-04-29 18:42:53 -04:00
11 changed files with 208 additions and 112 deletions
--- a/Application/Entities.cs
+++ b/Application/Entities.cs
@@ -1,22 +1,31 @@
-using FeedCenter.Data;
+using System;
+using System.Linq;
+using FeedCenter.Data;
 using FeedCenter.Options;
 using Realms;
-using System;
-using System.Linq;

 namespace FeedCenter;

 public class FeedCenterEntities
 {
-    public Realm RealmInstance { get; }
-
-    public RealmObservableCollection<Category> Categories { get; }
-    public RealmObservableCollection<Feed> Feeds { get; private set; }
-    public RealmObservableCollection<Setting> Settings { get; private set; }
-
    public FeedCenterEntities()
    {
-        var realmConfiguration = new RealmConfiguration($"{Database.DatabaseFile}");
+        var realmConfiguration = new RealmConfiguration($"{Database.DatabaseFile}")
+        {
+            SchemaVersion = 1,
+            MigrationCallback = (migration, oldSchemaVersion) =>
+            {
+                var newVersionFeeds = migration.NewRealm.All<Feed>();
+
+                foreach (var newVersionFeed in newVersionFeeds)
+                {
+                    if (oldSchemaVersion == 0)
+                    {
+                        newVersionFeed.UserAgent = null;
+                    }
+                }
+            }
+        };

        RealmInstance = Realm.GetInstance(realmConfiguration);

@@ -30,6 +39,17 @@ public class FeedCenterEntities
        }
    }

+    public RealmObservableCollection<Category> Categories { get; }
+
+    public Category DefaultCategory
+    {
+        get { return Categories.First(c => c.IsDefault); }
+    }
+
+    public RealmObservableCollection<Feed> Feeds { get; private set; }
+    private Realm RealmInstance { get; }
+    public RealmObservableCollection<Setting> Settings { get; private set; }
+
    public void Refresh()
    {
        RealmInstance.Refresh();
@@ -44,9 +64,4 @@ public class FeedCenterEntities
    {
        return RealmInstance.BeginWrite();
    }
-
-    public Category DefaultCategory
-    {
-        get { return Categories.First(c => c.IsDefault); }
-    }
 }
--- a/Application/Feeds/Feed.cs
+++ b/Application/Feeds/Feed.cs
@@ -1,12 +1,4 @@
-using ChrisKaczor.ApplicationUpdate;
-using FeedCenter.Data;
-using FeedCenter.FeedParsers;
-using FeedCenter.Properties;
-using FeedCenter.Xml;
-using JetBrains.Annotations;
-using Realms;
-using Serilog;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -19,6 +11,14 @@ using System.Net.Sockets;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using ChrisKaczor.ApplicationUpdate;
+using FeedCenter.Data;
+using FeedCenter.FeedParsers;
+using FeedCenter.Properties;
+using FeedCenter.Xml;
+using JetBrains.Annotations;
+using Realms;
+using Serilog;

 namespace FeedCenter;

@@ -98,9 +98,6 @@ public partial class Feed : RealmObject, INotifyDataErrorInfo
        }
    }

-    [MapTo("Password")]
-    public string RawPassword { get; set; }
-
    public string Password
    {
        get => RawPassword;
@@ -122,9 +119,15 @@ public partial class Feed : RealmObject, INotifyDataErrorInfo
    [MapTo("Name")]
    private string RawName { get; set; } = string.Empty;

+    [MapTo("Password")]
+    public string RawPassword { get; set; }
+
    [MapTo("Source")]
    private string RawSource { get; set; } = string.Empty;

+    [MapTo("Username")]
+    public string RawUsername { get; set; }
+
    public string Source
    {
        get => RawSource;
@@ -139,8 +142,7 @@ public partial class Feed : RealmObject, INotifyDataErrorInfo

    public string Title { get; set; }

-    [MapTo("Username")]
-    public string RawUsername { get; set; }
+    public string UserAgent { get; set; }

    public string Username
    {
@@ -242,6 +244,17 @@ public partial class Feed : RealmObject, INotifyDataErrorInfo
        return new Tuple<FeedType, string>(feedType, retrieveResult.Item2);
    }

+    private string GetUserAgent()
+    {
+        if (!string.IsNullOrWhiteSpace(UserAgent))
+            return UserAgent;
+
+        if (!string.IsNullOrWhiteSpace(Settings.Default.DefaultUserAgent))
+            return Settings.Default.DefaultUserAgent;
+
+        return "FeedCenter/" + UpdateCheck.LocalVersion;
+    }
+
    private Tuple<FeedReadResult, string> RetrieveFeed()
    {
        try
@@ -258,14 +271,15 @@ public partial class Feed : RealmObject, INotifyDataErrorInfo

                _httpClient = new HttpClient(clientHandler);

-                // Set a user agent string
-                var userAgent = string.IsNullOrWhiteSpace(Settings.Default.DefaultUserAgent) ? "FeedCenter/" + UpdateCheck.LocalVersion : Settings.Default.DefaultUserAgent;
-                _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd(userAgent);
-
                // Set a timeout
                _httpClient.Timeout = TimeSpan.FromSeconds(10);
            }

+            // Set a user agent string
+            var userAgent = GetUserAgent();
+            _httpClient.DefaultRequestHeaders.UserAgent.Clear();
+            _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd(userAgent);
+
            // If we need to authenticate then set the credentials
            _httpClient.DefaultRequestHeaders.Authorization = Authenticate ? new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.UTF8.GetBytes($"{Username}:{Password}"))) : null;

--- a/Application/Options/FeedWindow.xaml
+++ b/Application/Options/FeedWindow.xaml
@@ -94,6 +94,13 @@
                        <ComboBoxItem Content="{x:Static properties:Resources.openAllMultipleToolbarButton}"
                                      Tag="{x:Static feedCenter:MultipleOpenAction.IndividualPages}" />
                    </ComboBox>
+                    <ComboBox Name="UserAgentComboBox"
+                              mah:TextBoxHelper.UseFloatingWatermark="True"
+                              mah:TextBoxHelper.Watermark="{x:Static properties:Resources.userAgentLabel}"
+                              DisplayMemberPath="Caption"
+                              ItemsSource="{Binding Source={x:Static options:UserAgentItem.UserAgents}}"
+                              SelectedValuePath="UserAgent"
+                              SelectedValue="{Binding Path=UserAgent, UpdateSourceTrigger=Explicit, ValidatesOnExceptions=true}" />
                </StackPanel>
            </TabItem>
            <TabItem Header="{x:Static properties:Resources.authenticationTab}">
--- a/Application/Options/GeneralOptionsPanel.xaml
+++ b/Application/Options/GeneralOptionsPanel.xaml
@@ -12,11 +12,9 @@
                          d:DesignWidth="300">
    <StackPanel options:Spacing.Vertical="10">
        <CheckBox Content="{x:Static properties:Resources.startWithWindowsCheckBox}"
-                  Name="StartWithWindowsCheckBox"
                  IsChecked="{Binding Source={x:Static properties:Settings.Default}, Path=StartWithWindows}"
                  Click="OnSaveSettings" />
-        <ComboBox Name="BrowserComboBox"
-                  mah:TextBoxHelper.UseFloatingWatermark="True"
+        <ComboBox mah:TextBoxHelper.UseFloatingWatermark="True"
                  mah:TextBoxHelper.Watermark="{x:Static properties:Resources.defaultBrowserLabel}"
                  d:DataContext="{d:DesignInstance Type=installedBrowsers:InstalledBrowser}"
                  DisplayMemberPath="Name"
@@ -24,12 +22,11 @@
                  SelectedValuePath="Key"
                  SelectedValue="{Binding Source={x:Static properties:Settings.Default}, Path=Browser}"
                  SelectionChanged="OnSaveSettings" />
-        <ComboBox Name="UserAgentComboBox"
-                  mah:TextBoxHelper.UseFloatingWatermark="True"
+        <ComboBox mah:TextBoxHelper.UseFloatingWatermark="True"
                  mah:TextBoxHelper.Watermark="{x:Static properties:Resources.defaultUserAgentLabel}"
                  d:DataContext="{d:DesignInstance Type=options:UserAgentItem}"
                  DisplayMemberPath="Caption"
-                  ItemsSource="{Binding Source={x:Static options:UserAgentItem.UserAgents}}"
+                  ItemsSource="{Binding Source={x:Static options:UserAgentItem.DefaultUserAgents}}"
                  SelectedValuePath="UserAgent"
                  SelectedValue="{Binding Source={x:Static properties:Settings.Default}, Path=DefaultUserAgent}"
                  SelectionChanged="OnSaveSettings" />
--- a/Application/Options/UserAgentItem.cs
+++ b/Application/Options/UserAgentItem.cs
@@ -1,17 +1,18 @@
 using System.Collections.Generic;
+using System.Linq;
+using FeedCenter.Properties;

 namespace FeedCenter.Options;

 public class UserAgentItem
 {
    public string Caption { get; set; }
-    public string UserAgent { get; set; }

-    public static List<UserAgentItem> UserAgents => new()
+    public static List<UserAgentItem> DefaultUserAgents => new()
    {
        new UserAgentItem
        {
-            Caption = Properties.Resources.DefaultUserAgentCaption,
+            Caption = Properties.Resources.ApplicationUserAgentCaption,
            UserAgent = string.Empty
        },
        new UserAgentItem
@@ -30,4 +31,29 @@ public class UserAgentItem
            UserAgent = "curl/7.47.0"
        }
    };
+
+    public string UserAgent { get; set; }
+
+    public static List<UserAgentItem> UserAgents
+    {
+        get
+        {
+            var defaultUserAgents = DefaultUserAgents;
+
+            var applicationDefaultUserAgent = defaultUserAgents.First(dua => dua.UserAgent == Settings.Default.DefaultUserAgent);
+
+            var userAgents = new List<UserAgentItem>
+            {
+                new()
+                {
+                    Caption = string.Format(Resources.DefaultUserAgentCaption, applicationDefaultUserAgent.Caption),
+                    UserAgent = null
+                }
+            };
+
+            userAgents.AddRange(defaultUserAgents);
+
+            return userAgents;
+        }
+    }
 }
--- a/Application/Properties/Resources.Designer.cs
+++ b/Application/Properties/Resources.Designer.cs
@@ -133,6 +133,15 @@ namespace FeedCenter.Properties {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Feed Center.
+        /// </summary>
+        public static string ApplicationUserAgentCaption {
+            get {
+                return ResourceManager.GetString("ApplicationUserAgentCaption", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Password.
        /// </summary>
@@ -517,7 +526,7 @@ namespace FeedCenter.Properties {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Feed Center.
+        ///   Looks up a localized string similar to Default ({0}).
        /// </summary>
        public static string DefaultUserAgentCaption {
            get {
@@ -1461,6 +1470,15 @@ namespace FeedCenter.Properties {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to User agent.
+        /// </summary>
+        public static string userAgentLabel {
+            get {
+                return ResourceManager.GetString("userAgentLabel", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Version {0}.
        /// </summary>
--- a/Application/Properties/Resources.resx
+++ b/Application/Properties/Resources.resx
@@ -524,6 +524,9 @@
    <value>Category: {0}</value>
  </data>
  <data name="DefaultUserAgentCaption" xml:space="preserve">
+    <value>Default ({0})</value>
+  </data>
+  <data name="ApplicationUserAgentCaption" xml:space="preserve">
    <value>Feed Center</value>
  </data>
  <data name="defaultUserAgentLabel" xml:space="preserve">
@@ -549,4 +552,7 @@ All feeds currently in category "{0}" will be moved to the default category.</va
  <data name="ConfirmDeleteFeeds" xml:space="preserve">
    <value>Are you sure you want to delete the selected feeds?</value>
  </data>
+  <data name="userAgentLabel" xml:space="preserve">
+    <value>User agent</value>
+  </data>
 </root>
--- a/Bootstrapper/Bootstrapper.wixproj
+++ b/Bootstrapper/Bootstrapper.wixproj
@@ -37,6 +37,10 @@
      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
      <Name>WixNetFxExtension</Name>
    </WixExtension>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Application\FeedCenter.csproj">
@@ -66,12 +70,4 @@
  <PropertyGroup>
    <PostBuildEvent />
  </PropertyGroup>
-  <!--
-	To modify your build process, add your task inside one of the targets below and uncomment it.
-	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
 </Project>
--- a/Bootstrapper/Bundle.wxs
+++ b/Bootstrapper/Bundle.wxs
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
+     xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">

 	<?define ProductName="$(fileVersion.ProductName($(var.FeedCenter.TargetPath)))" ?>
 	<?define CompanyName="$(fileVersion.CompanyName($(var.FeedCenter.TargetPath)))" ?>
@@ -13,6 +14,18 @@
 	        UpgradeCode="5e5c13a5-635e-4310-a653-0f9760f46935"
 	        Compressed="no">

+		<util:DirectorySearch Id="DotnetDesktopRuntimeSearch_x86"
+		                      Path="[ProgramFilesFolder]dotnet\shared\Microsoft.WindowsDesktop.App\7.0.5"
+		                      Result="exists"
+		                      Variable="DotnetDesktopRuntimeExists_x86"
+		                      Condition="NOT VersionNT64" />
+
+		<util:DirectorySearch Id="DotnetDesktopRuntimeSearch_x64"
+		                      Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\7.0.5"
+		                      Result="exists"
+		                      Variable="DotnetDesktopRuntimeExists_x64"
+		                      Condition="VersionNT64" />
+
 		<BootstrapperApplicationRef Id="WixExtendedBootstrapperApplication.HyperlinkLicense">
 			<bal:WixExtendedBootstrapperApplication LicenseUrl=""
 			                                        SuppressOptionsUI="yes"
@@ -28,9 +41,10 @@
 			            DisplayName=".NET 7.0 Desktop Runtime (x64)"
 			            InstallCommand="/install /quiet"
 			            Permanent="yes"
-						Compressed="no"
+			            Compressed="no"
 			            DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/dffb1939-cef1-4db3-a579-5475a3061cdd/578b208733c914c7b7357f6baa4ecfd6/windowsdesktop-runtime-7.0.5-win-x64.exe"
 			            Name="windowsdesktop-runtime-7.0.5-win-x64.exe"
+			            DetectCondition="DotnetDesktopRuntimeExists_x64 = 1"
 			            InstallCondition='VersionNT64'>
 				<RemotePayload ProductName="Microsoft Windows Desktop Runtime - 7.0.5 (x64)"
 				               Description="Microsoft Windows Desktop Runtime - 7.0.5 (x64)"
@@ -42,9 +56,10 @@
 			            DisplayName=".NET 7.0 Desktop Runtime (x86)"
 			            InstallCommand="/install /quiet"
 			            Permanent="yes"
-						Compressed="no"
+			            Compressed="no"
 			            DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/eb64dcd1-d277-4798-ada1-600805c9e2dc/fc73c843d66f3996e7ef22468f4902e6/windowsdesktop-runtime-7.0.5-win-x86.exe"
 			            Name="windowsdesktop-runtime-7.0.5-win-x86.exe"
+			            DetectCondition="DotnetDesktopRuntimeExists_x86 = 1"
 			            InstallCondition='NOT VersionNT64'>
 				<RemotePayload ProductName="Microsoft Windows Desktop Runtime - 7.0.5 (x86)"
 				               Description="Microsoft Windows Desktop Runtime - 7.0.5 (x86)"
--- a/FeedCenter.sln
+++ b/FeedCenter.sln
@@ -18,32 +18,32 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{14
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug - With Setup|Any CPU = Debug - With Setup|Any CPU
-		Debug - With Setup|Mixed Platforms = Debug - With Setup|Mixed Platforms
-		Debug - With Setup|x64 = Debug - With Setup|x64
-		Debug - With Setup|x86 = Debug - With Setup|x86
+		Debug (No Installer)|Any CPU = Debug (No Installer)|Any CPU
+		Debug (No Installer)|Mixed Platforms = Debug (No Installer)|Mixed Platforms
+		Debug (No Installer)|x64 = Debug (No Installer)|x64
+		Debug (No Installer)|x86 = Debug (No Installer)|x86
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release - With Setup|Any CPU = Release - With Setup|Any CPU
-		Release - With Setup|Mixed Platforms = Release - With Setup|Mixed Platforms
-		Release - With Setup|x64 = Release - With Setup|x64
-		Release - With Setup|x86 = Release - With Setup|x86
+		Release (No Installer)|Any CPU = Release (No Installer)|Any CPU
+		Release (No Installer)|Mixed Platforms = Release (No Installer)|Mixed Platforms
+		Release (No Installer)|x64 = Release (No Installer)|x64
+		Release (No Installer)|x86 = Release (No Installer)|x86
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|Any CPU.Build.0 = Debug|Any CPU
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|x64.ActiveCfg = Debug|x64
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|x64.Build.0 = Debug|x64
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|x86.ActiveCfg = Debug|x86
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|x86.Build.0 = Debug|x86
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug (No Installer)|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug (No Installer)|Any CPU.Build.0 = Debug|Any CPU
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug (No Installer)|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug (No Installer)|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug (No Installer)|x64.ActiveCfg = Debug|x64
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug (No Installer)|x64.Build.0 = Debug|x64
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug (No Installer)|x86.ActiveCfg = Debug|x86
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug (No Installer)|x86.Build.0 = Debug|x86
 		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -52,69 +52,69 @@ Global
 		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|x64.Build.0 = Debug|x64
 		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|x86.ActiveCfg = Debug|x86
 		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|x86.Build.0 = Debug|x86
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|Any CPU.ActiveCfg = Release|Any CPU
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|Any CPU.Build.0 = Release|Any CPU
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|Mixed Platforms.Build.0 = Release|Any CPU
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|x64.ActiveCfg = Release|x86
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|x86.ActiveCfg = Release|Any CPU
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|x86.Build.0 = Release|Any CPU
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release (No Installer)|Any CPU.ActiveCfg = Release|Any CPU
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release (No Installer)|Any CPU.Build.0 = Release|Any CPU
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release (No Installer)|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release (No Installer)|Mixed Platforms.Build.0 = Release|Any CPU
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release (No Installer)|x64.ActiveCfg = Release|x86
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release (No Installer)|x86.ActiveCfg = Release|x86
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release (No Installer)|x86.Build.0 = Release|x86
 		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|x64.ActiveCfg = Release|x86
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|x86.ActiveCfg = Release|x86
-		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|x86.Build.0 = Release|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|Any CPU.ActiveCfg = Debug|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|Any CPU.Build.0 = Debug|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|Mixed Platforms.ActiveCfg = Debug|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|Mixed Platforms.Build.0 = Debug|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|x64.ActiveCfg = Debug|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|x64.Build.0 = Debug|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|x86.ActiveCfg = Debug|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|x86.Build.0 = Debug|x86
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|x86.ActiveCfg = Release|Any CPU
+		{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|x86.Build.0 = Release|Any CPU
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug (No Installer)|Any CPU.ActiveCfg = Debug|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug (No Installer)|Mixed Platforms.ActiveCfg = Debug|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug (No Installer)|x64.ActiveCfg = Debug|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug (No Installer)|x64.Build.0 = Debug|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug (No Installer)|x86.ActiveCfg = Debug|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug (No Installer)|x86.Build.0 = Debug|x86
 		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|Any CPU.Build.0 = Debug|x86
 		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|x64.ActiveCfg = Debug|x86
 		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|x64.Build.0 = Debug|x86
 		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|x86.ActiveCfg = Debug|x86
 		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|x86.Build.0 = Debug|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|Any CPU.ActiveCfg = Release|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|Any CPU.Build.0 = Release|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|Mixed Platforms.ActiveCfg = Release|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|Mixed Platforms.Build.0 = Release|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|x64.ActiveCfg = Release|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|x86.ActiveCfg = Release|x86
-		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|x86.Build.0 = Release|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release (No Installer)|Any CPU.ActiveCfg = Release|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release (No Installer)|Mixed Platforms.ActiveCfg = Release|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release (No Installer)|x64.ActiveCfg = Release|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release (No Installer)|x86.ActiveCfg = Release|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release (No Installer)|x86.Build.0 = Release|x86
 		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|Any CPU.ActiveCfg = Release|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|Any CPU.Build.0 = Release|x86
 		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|Mixed Platforms.Build.0 = Release|x86
 		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|x64.ActiveCfg = Release|x86
 		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|x86.ActiveCfg = Release|x86
 		{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|x86.Build.0 = Release|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|Any CPU.ActiveCfg = Debug|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|Any CPU.Build.0 = Debug|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|Mixed Platforms.ActiveCfg = Debug|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|Mixed Platforms.Build.0 = Debug|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|x64.ActiveCfg = Debug|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|x64.Build.0 = Debug|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|x86.ActiveCfg = Debug|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|x86.Build.0 = Debug|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug (No Installer)|Any CPU.ActiveCfg = Debug|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug (No Installer)|Mixed Platforms.ActiveCfg = Debug|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug (No Installer)|x64.ActiveCfg = Debug|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug (No Installer)|x64.Build.0 = Debug|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug (No Installer)|x86.ActiveCfg = Debug|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug (No Installer)|x86.Build.0 = Debug|x86
 		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|Any CPU.Build.0 = Debug|x86
 		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|x64.ActiveCfg = Debug|x86
 		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|x64.Build.0 = Debug|x86
 		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|x86.ActiveCfg = Debug|x86
 		{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|x86.Build.0 = Debug|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|Any CPU.ActiveCfg = Release|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|Any CPU.Build.0 = Release|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|Mixed Platforms.ActiveCfg = Release|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|Mixed Platforms.Build.0 = Release|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|x64.ActiveCfg = Release|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|x86.ActiveCfg = Release|x86
-		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|x86.Build.0 = Release|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release (No Installer)|Any CPU.ActiveCfg = Release|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release (No Installer)|Mixed Platforms.ActiveCfg = Release|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release (No Installer)|x64.ActiveCfg = Release|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release (No Installer)|x86.ActiveCfg = Release|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release (No Installer)|x86.Build.0 = Release|x86
 		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|Any CPU.ActiveCfg = Release|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|Any CPU.Build.0 = Release|x86
 		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|Mixed Platforms.Build.0 = Release|x86
 		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|x64.ActiveCfg = Release|x86
 		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|x86.ActiveCfg = Release|x86
 		{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|x86.Build.0 = Release|x86
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,9 +1,12 @@
 version: 1.1.0.{build}
+branches:
+  only:
+    - main
 pull_requests:
  do_not_increment_build_number: true
 skip_tags: true
 image: Visual Studio 2022
-configuration: Release - With Setup
+configuration: Release
 platform: x86  
 assembly_info:
  patch: true
@@ -20,5 +23,4 @@ deploy:
 - provider: Environment
  name: GitHub
 before_build:
- cmd: nuget restore
- cmd: nuget restore Application\FeedCenter.csproj
+- cmd: nuget restore
Author	SHA1	Message	Date
Chris Kaczor	0ddd38e3f2	Add support for per-feed user agent	2023-06-15 17:28:38 -04:00
Chris Kaczor	f5f78c8825	Remove extra restore now that config is fixed	2023-04-29 19:06:58 -04:00
Chris Kaczor	477185341e	Branch and config updates	2023-04-29 19:03:25 -04:00
Chris Kaczor	1db13fbe2e	Update installer to detect .NET runtime	2023-04-29 18:42:53 -04:00