5 Commits

Author SHA1 Message Date
840bd1acd0 Remove post-build steps 2018-04-06 13:10:58 -04:00
ed1d5566f2 Update Common version 2018-04-06 10:29:31 -04:00
be1bd39974 Add JSON binary to installer 2018-04-06 10:13:54 -04:00
92469c15aa Switch to getting updates from GitHub 2018-04-06 09:57:00 -04:00
0826ecfce3 Try to fix line endings on SQL scripts 2018-04-05 16:39:36 -04:00
9 changed files with 11 additions and 25 deletions

1
.gitattributes vendored
View File

@@ -2,6 +2,7 @@
# Set default behavior to automatically normalize line endings. # Set default behavior to automatically normalize line endings.
############################################################################### ###############################################################################
* text=auto * text=auto
*.sqlce text eol=crlf
############################################################################### ###############################################################################
# Set default behavior for command prompt diff. # Set default behavior for command prompt diff.

View File

@@ -9,8 +9,8 @@ namespace FeedCenter
private static void InitializeUpdate() private static void InitializeUpdate()
{ {
UpdateCheck.ApplicationName = Properties.Resources.ApplicationDisplayName; UpdateCheck.ApplicationName = Properties.Resources.ApplicationDisplayName;
UpdateCheck.UpdateServerType = ServerType.GitHub;
UpdateCheck.UpdateServer = Settings.Default.VersionLocation; UpdateCheck.UpdateServer = Settings.Default.VersionLocation;
UpdateCheck.UpdateFile = Settings.Default.VersionFile;
UpdateCheck.ApplicationShutdown = ApplicationShutdown; UpdateCheck.ApplicationShutdown = ApplicationShutdown;
UpdateCheck.ApplicationCurrentMessage = ApplicationCurrentMessage; UpdateCheck.ApplicationCurrentMessage = ApplicationCurrentMessage;
UpdateCheck.ApplicationUpdateMessage = ApplicationUpdateMessage; UpdateCheck.ApplicationUpdateMessage = ApplicationUpdateMessage;

View File

@@ -12,7 +12,7 @@ namespace FeedCenter.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -262,16 +262,7 @@ namespace FeedCenter.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("FeedCenterSetup.xml")] [global::System.Configuration.DefaultSettingValueAttribute("https://api.github.com/repos/ckaczor/FeedCenter/releases/latest")]
public string VersionFile {
get {
return ((string)(this["VersionFile"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://server/FeedCenter/")]
public string VersionLocation { public string VersionLocation {
get { get {
return ((string)(this["VersionLocation"])); return ((string)(this["VersionLocation"]));

View File

@@ -62,11 +62,8 @@
<Setting Name="MultipleLineDisplay" Provider="Common.Settings.GenericSettingsProvider" Type="FeedCenter.Options.MultipleLineDisplay" Scope="User"> <Setting Name="MultipleLineDisplay" Provider="Common.Settings.GenericSettingsProvider" Type="FeedCenter.Options.MultipleLineDisplay" Scope="User">
<Value Profile="(Default)">Normal</Value> <Value Profile="(Default)">Normal</Value>
</Setting> </Setting>
<Setting Name="VersionFile" Type="System.String" Scope="Application">
<Value Profile="(Default)">FeedCenterSetup.xml</Value>
</Setting>
<Setting Name="VersionLocation" Type="System.String" Scope="Application"> <Setting Name="VersionLocation" Type="System.String" Scope="Application">
<Value Profile="(Default)">http://server/FeedCenter/</Value> <Value Profile="(Default)">https://api.github.com/repos/ckaczor/FeedCenter/releases/latest</Value>
</Setting> </Setting>
<Setting Name="LastCategoryID" Type="System.String" Scope="User"> <Setting Name="LastCategoryID" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />

View File

@@ -82,11 +82,8 @@
<setting name="VersionCheckInterval" serializeAs="String"> <setting name="VersionCheckInterval" serializeAs="String">
<value>01:00:00</value> <value>01:00:00</value>
</setting> </setting>
<setting name="VersionFile" serializeAs="String">
<value>FeedCenterSetup.xml</value>
</setting>
<setting name="VersionLocation" serializeAs="String"> <setting name="VersionLocation" serializeAs="String">
<value>http://server/FeedCenter/</value> <value>https://api.github.com/repos/ckaczor/FeedCenter/releases/latest</value>
</setting> </setting>
</FeedCenter.Properties.Settings> </FeedCenter.Properties.Settings>
</applicationSettings> </applicationSettings>

View File

@@ -61,9 +61,7 @@
</ItemGroup> </ItemGroup>
<Import Project="$(WixTargetsPath)" /> <Import Project="$(WixTargetsPath)" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>rem D:\Code\Personal\CreateInstallDescriptor\bin\Debug\CreateInstallDescriptor.exe !(TargetPath) $(TargetDir)\$(TargetName).xml <PostBuildEvent />
rem copy $(TargetDir)\$(TargetName).xml \\server\d\FeedCenter
rem copy $(TargetDir)\$(TargetName).exe \\server\d\FeedCenter</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<!-- <!--
To modify your build process, add your task inside one of the targets below and uncomment it. To modify your build process, add your task inside one of the targets below and uncomment it.

2
Common

Submodule Common updated: 81ef8f451c...686f33982d

View File

@@ -177,6 +177,8 @@
<File Source="$(var.FeedCenter.TargetDir)\HtmlAgilityPack.dll" /> <File Source="$(var.FeedCenter.TargetDir)\HtmlAgilityPack.dll" />
<File Source="$(var.FeedCenter.TargetDir)\Newtonsoft.Json.dll" />
<File Source="$(var.FeedCenter.TargetDir)\EntityFramework.dll" /> <File Source="$(var.FeedCenter.TargetDir)\EntityFramework.dll" />
<File Source="$(var.FeedCenter.TargetDir)\EntityFramework.SqlServer.dll" /> <File Source="$(var.FeedCenter.TargetDir)\EntityFramework.SqlServer.dll" />
<File Source="$(var.FeedCenter.TargetDir)\EntityFramework.SqlServerCompact.dll" /> <File Source="$(var.FeedCenter.TargetDir)\EntityFramework.SqlServerCompact.dll" />

View File

@@ -1,4 +1,4 @@
version: 1.0.{build} version: 1.0.0.{build}
pull_requests: pull_requests:
do_not_increment_build_number: true do_not_increment_build_number: true
skip_tags: true skip_tags: true