From 3e4ac708886d50f7cc4f146d0846402690a3c94c Mon Sep 17 00:00:00 2001 From: BuildFeed Bot <35148566+buildfeedbot@users.noreply.github.com> Date: Fri, 5 Jan 2018 22:49:37 +0000 Subject: [PATCH] Continue cleaning copyrights; New versioning system --- .../MongoAuth/Properties/AssemblyInfo.cs | 12 ++++----- BuildFeed.sln | 11 +++++++- BuildFeed/BuildFeed.csproj | 19 +++++++++++--- BuildFeed/Controllers/BaseController.cs | 10 ++++++++ BuildFeed/OneSignalSDKUpdaterWorker.js | 2 +- BuildFeed/OneSignalSDKWorker.js | 2 +- .../PublishProfiles/Local Folder.pubxml | 4 +-- .../PublishProfiles/Milestone 1 FTP.pubxml | 25 ------------------- BuildFeed/Views/shared/_default.cshtml | 4 +-- BuildFeed/packages.config | 1 + BuildFeed/res/css/winter.css.map | 2 +- LICENSE.md | 2 +- README.md | 2 +- 13 files changed, 51 insertions(+), 45 deletions(-) delete mode 100644 BuildFeed/Properties/PublishProfiles/Milestone 1 FTP.pubxml diff --git a/Authentication/MongoAuth/Properties/AssemblyInfo.cs b/Authentication/MongoAuth/Properties/AssemblyInfo.cs index 846d3a9..b22a8c5 100644 --- a/Authentication/MongoAuth/Properties/AssemblyInfo.cs +++ b/Authentication/MongoAuth/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// 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: AssemblyTitle("Mongo Authentication")] @@ -10,12 +10,12 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("BuildFeed")] -[assembly: AssemblyCopyright("Copyright © 2015, Thomas Hounsell")] +[assembly: AssemblyCopyright("Copyright © 2013 - 2018, The BuildFeed Team")] [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 +// 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)] @@ -25,11 +25,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers +// 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")] diff --git a/BuildFeed.sln b/BuildFeed.sln index 47696c1..680471c 100644 --- a/BuildFeed.sln +++ b/BuildFeed.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.4 +VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildFeed", "BuildFeed\BuildFeed.csproj", "{CDDCF754-ECAA-4A66-ADAA-62957A57A51B}" ProjectSection(ProjectDependencies) = postProject @@ -22,6 +22,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildFeed.Local", "BuildFee EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildFeed.Model", "BuildFeed.Model\BuildFeed.Model.csproj", "{7E2B4F61-1C11-4471-AF80-5480E94C0664}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{948A2168-A092-4958-A465-427271563061}" + ProjectSection(SolutionItems) = preProject + LICENSE.md = LICENSE.md + README.md = README.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -130,4 +136,7 @@ Global {7C67BFB9-1B3B-4676-A58D-10573DA82CFE} = {53344C34-3493-4D0E-8425-FB18C0CC59D0} {5CAADB66-1FC2-4492-B766-36354687120D} = {2B646675-44D1-4722-8A86-8C64876C8FB7} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6A6DB9E7-436C-4AE8-AFDA-47F01C431810} + EndGlobalSection EndGlobal diff --git a/BuildFeed/BuildFeed.csproj b/BuildFeed/BuildFeed.csproj index b91be94..7f1d783 100644 --- a/BuildFeed/BuildFeed.csproj +++ b/BuildFeed/BuildFeed.csproj @@ -1,5 +1,6 @@  + @@ -17,7 +18,8 @@ BuildFeed BuildFeed v4.7 - false + false + true true @@ -31,6 +33,8 @@ true 2.6 + False + false true @@ -279,6 +283,10 @@ + + package.json + + winter.scss @@ -359,8 +367,6 @@ - - @@ -433,7 +439,6 @@ - @@ -555,8 +560,14 @@ + + + + + attrib +H $(ProjectDir)node_modules /D + @@ -11,7 +11,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt True False - D:\Publish\dev.buildfeed.net + $(HOMEDRIVE)$(HOMEPATH)\Documents\Publish\buildfeed.net True True False diff --git a/BuildFeed/Properties/PublishProfiles/Milestone 1 FTP.pubxml b/BuildFeed/Properties/PublishProfiles/Milestone 1 FTP.pubxml deleted file mode 100644 index f033380..0000000 --- a/BuildFeed/Properties/PublishProfiles/Milestone 1 FTP.pubxml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - FTP - Release - Any CPU - https://buildfeed.net/ - True - False - ftp://milestone-1.co.uk - False - True - /BuildFeed/buildfeed.net/ - Administrator - <_SavePWD>False - True - True - False - DonotMerge - - \ No newline at end of file diff --git a/BuildFeed/Views/shared/_default.cshtml b/BuildFeed/Views/shared/_default.cshtml index 498029d..c699347 100644 --- a/BuildFeed/Views/shared/_default.cshtml +++ b/BuildFeed/Views/shared/_default.cshtml @@ -285,10 +285,10 @@ if (Roles.IsUserInRole("Administrators"))