Continue cleaning copyrights; New versioning system

This commit is contained in:
BuildFeed Bot 2018-01-05 22:49:37 +00:00
parent f0452978a3
commit 3e4ac70888
13 changed files with 51 additions and 45 deletions

View File

@ -10,7 +10,7 @@
[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("")]

View File

@ -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

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSBuildGitHash.0.2.0\build\MSBuildGitHash.props" Condition="Exists('..\packages\MSBuildGitHash.0.2.0\build\MSBuildGitHash.props')" />
<Import Project="..\packages\Microsoft.Net.Compilers.2.6.1\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.2.6.1\build\Microsoft.Net.Compilers.props')" />
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
@ -17,7 +18,8 @@
<RootNamespace>BuildFeed</RootNamespace>
<AssemblyName>BuildFeed</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<EnableUpdateable>false</EnableUpdateable>
<MvcBuildViews>true</MvcBuildViews>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
@ -31,6 +33,8 @@
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>2.6</TypeScriptToolsVersion>
<Use64BitIISExpress />
<MSBuildGitHashValidate>False</MSBuildGitHashValidate>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -279,6 +283,10 @@
<Content Include="browserconfig.xml" />
<None Include="gulpfile.js" />
<None Include="res\css\inc\_christmas.scss" />
<None Include="package-lock.json">
<DependentUpon>package.json</DependentUpon>
</None>
<Content Include="res\card\Feature2.png" />
<Content Include="res\css\winter.css">
<DependentUpon>winter.scss</DependentUpon>
</Content>
@ -359,8 +367,6 @@
<Content Include="res\Web.config" />
<Content Include="res\css\light.scss" />
<Content Include="packages.config" />
<None Include="Properties\PublishProfiles\Milestone 1 WebDeploy %28Private%29.pubxml" />
<None Include="Properties\PublishProfiles\Milestone 1 WebDeploy.pubxml" />
<Content Include="res\css\inc\_variables.scss" />
<Content Include="res\css\inc\_nord.scss" />
<Content Include="res\css\winter.scss" />
@ -433,7 +439,6 @@
<Content Include="Scripts\trumbowyg\ui\trumbowyg.min.css" />
<Content Include="yandex_702baad42b020be7.html" />
<None Include="Properties\PublishProfiles\Local Folder.pubxml" />
<None Include="Properties\PublishProfiles\Milestone 1 FTP.pubxml" />
<Content Include="googleacffc6da14c53e15.html" />
<Content Include="Scripts\_references.js" />
<Content Include="Web.config">
@ -555,8 +560,14 @@
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.1\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.1\build\netstandard2.0\NETStandard.Library.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.6.1\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.6.1\build\Microsoft.Net.Compilers.props'))" />
<Error Condition="!Exists('..\packages\MSBuildGitHash.0.2.0\build\MSBuildGitHash.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuildGitHash.0.2.0\build\MSBuildGitHash.props'))" />
<Error Condition="!Exists('..\packages\MSBuildGitHash.0.2.0\build\MSBuildGitHash.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuildGitHash.0.2.0\build\MSBuildGitHash.targets'))" />
</Target>
<Import Project="..\packages\NETStandard.Library.2.0.1\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.1\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\MSBuildGitHash.0.2.0\build\MSBuildGitHash.targets" Condition="Exists('..\packages\MSBuildGitHash.0.2.0\build\MSBuildGitHash.targets')" />
<PropertyGroup>
<PreBuildEvent>attrib +H $(ProjectDir)node_modules /D</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

View File

@ -1,4 +1,6 @@
using System.Globalization;
using System.Linq;
using System.Reflection;
using System.Web.Mvc;
using System.Web.Routing;
using BuildFeed.Code.Options;
@ -7,6 +9,13 @@ namespace BuildFeed.Controllers
{
public class BaseController : Controller
{
public static string VersionString = Assembly.GetExecutingAssembly()
.GetCustomAttributes(typeof(AssemblyMetadataAttribute))
.OfType<AssemblyMetadataAttribute>()
.FirstOrDefault(a => a.Key == "GitHash")
?.Value
?? "N/A";
protected override void Initialize(RequestContext requestContext)
{
CultureInfo ci = Locale.DetectCulture(requestContext.HttpContext);
@ -14,6 +23,7 @@ protected override void Initialize(RequestContext requestContext)
CultureInfo.CurrentUICulture = ci;
ViewBag.Theme = new Theme(Theme.DetectTheme(requestContext.HttpContext));
ViewBag.Version = VersionString;
base.Initialize(requestContext);
}

View File

@ -1 +1 @@
importScripts("https://cdn.onesignal.com/sdks/OneSignalSDK.js");
importScripts('https://cdn.onesignal.com/sdks/OneSignalSDK.js');

View File

@ -1 +1 @@
importScripts("https://cdn.onesignal.com/sdks/OneSignalSDK.js");
importScripts('https://cdn.onesignal.com/sdks/OneSignalSDK.js');

View File

@ -11,7 +11,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<publishUrl>D:\Publish\dev.buildfeed.net</publishUrl>
<publishUrl>$(HOMEDRIVE)$(HOMEPATH)\Documents\Publish\buildfeed.net</publishUrl>
<DeleteExistingFiles>True</DeleteExistingFiles>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>False</EnableUpdateable>

View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>FTP</WebPublishMethod>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish>https://buildfeed.net/</SiteUrlToLaunchAfterPublish>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<publishUrl>ftp://milestone-1.co.uk</publishUrl>
<DeleteExistingFiles>False</DeleteExistingFiles>
<FtpPassiveMode>True</FtpPassiveMode>
<FtpSitePath>/BuildFeed/buildfeed.net/</FtpSitePath>
<UserName>Administrator</UserName>
<_SavePWD>False</_SavePWD>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
</PropertyGroup>
</Project>

View File

@ -285,10 +285,10 @@ if (Roles.IsUserInRole("Administrators"))
</div>
<div class="footer-flex-item">
<p>
&copy; 2013 - @DateTime.Now.Year.ToString(), <span dir="ltr">@InvariantTerms.SiteName</span>
<span dir="ltr">@InvariantTerms.SiteName @($"v{ViewBag.Version}")</span>
</p>
<p>
@Html.Raw(string.Format(VariantTerms.Common_DevelopedBy, $"<a href=\"https://twitter.com/buildfeed\" target=\"_blank\" dir=\"ltr\" rel=\"noopener\">{InvariantTerms.DeveloperName}</a>"))
&copy; 2013 - @DateTime.Now.Year.ToString(), @Html.Raw(string.Format(VariantTerms.Common_DevelopedBy, $"<a href=\"https://twitter.com/buildfeed\" target=\"_blank\" dir=\"ltr\" rel=\"noopener\">{InvariantTerms.DeveloperName}</a>"))
</p>
<p>
@Html.Raw(string.Format(VariantTerms.Common_ContributeOn, "<a href=\"https://github.com/BuildFeed/BuildFeed\" target=\"_blank\" dir=\"ltr\" rel=\"noopener\"><i class=\"fa fa-github\"></i>&ensp;GitHub</a>"))

View File

@ -67,6 +67,7 @@
<package id="MongoDB.Bson" version="2.5.0" targetFramework="net47" />
<package id="MongoDB.Driver" version="2.5.0" targetFramework="net47" />
<package id="MongoDB.Driver.Core" version="2.5.0" targetFramework="net47" />
<package id="MSBuildGitHash" version="0.2.0" targetFramework="net47" />
<package id="NETStandard.Library" version="2.0.1" targetFramework="net47" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net47" />
<package id="OneSignal.RestAPIv3.Client" version="1.0.3" targetFramework="net47" />

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
Copyright © 2015-2018, The BuildFeed Team.
Copyright © 2013 - 2018, The BuildFeed Team.
All rights reserved.

View File

@ -110,7 +110,7 @@ There's also two further projects contained within the solution.
## License
Copyright © 2015-2018, The BuildFeed Team.
Copyright © 2013 - 2018, The BuildFeed Team.
All rights reserved.