Separate out HoloLens / Analog on the front page; Package and translation updates

This commit is contained in:
BuildFeed Bot 2018-04-12 15:58:59 +01:00
parent 92af7a4cc9
commit fa95429657
No known key found for this signature in database
GPG Key ID: 3757685ADD91E0A1
21 changed files with 210 additions and 67 deletions

View File

@ -420,6 +420,15 @@ public static string Front_Comments {
}
}
/// <summary>
/// Looks up a localized string similar to Current HoloLens.
/// </summary>
public static string Front_CurrentAnalog {
get {
return ResourceManager.GetString("Front_CurrentAnalog", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Current Canary.
/// </summary>

View File

@ -242,6 +242,9 @@ The {0} Team.</value>
<data name="Front_Comments" xml:space="preserve">
<value>Comments</value>
</data>
<data name="Front_CurrentAnalog" xml:space="preserve">
<value>Current HoloLens</value>
</data>
<data name="Front_CurrentCanary" xml:space="preserve">
<value>Current Canary</value>
</data>

View File

@ -159,6 +159,9 @@
<data name="Common_Admin" xml:space="preserve">
<value>Administrator</value>
</data>
<data name="Common_Blog" xml:space="preserve">
<value>Blog</value>
</data>
<data name="Common_ChangePassword" xml:space="preserve">
<value>Wachtwoord veranderen</value>
</data>
@ -201,6 +204,9 @@
<data name="Common_ThemeLight" xml:space="preserve">
<value>Licht</value>
</data>
<data name="Common_ThemeWinter" xml:space="preserve">
<value>Winter</value>
</data>
<data name="Common_TitlePage" xml:space="preserve">
<value>| Pagina {0}</value>
</data>
@ -236,6 +242,9 @@ Het {0} Team.</value>
<data name="Front_Comments" xml:space="preserve">
<value>Commentaar</value>
</data>
<data name="Front_CurrentAnalog" xml:space="preserve">
<value>Huidige HoloLens</value>
</data>
<data name="Front_CurrentCanary" xml:space="preserve">
<value>Huidige canary</value>
</data>
@ -422,6 +431,9 @@ Het {0} Team.</value>
<data name="Search_Year" xml:space="preserve">
<value>Jaar</value>
</data>
<data name="Support_AccountValidation" xml:space="preserve">
<value>Elk account wordt gevalideerd bij de administrator, dus wees geduldig en controleer later opnieuw</value>
</data>
<data name="Support_AdditionsToBuildFeed" xml:space="preserve">
<value>Toevoegingen aan BuildFeed</value>
</data>
@ -497,6 +509,9 @@ Het {0} Team.</value>
<data name="Support_RememberMe" xml:space="preserve">
<value>Onthoud mij</value>
</data>
<data name="Support_ThanksRegister" xml:space="preserve">
<value>Bedankt voor het registreren</value>
</data>
<data name="Support_UserName" xml:space="preserve">
<value>Gebruikersnaam</value>
</data>
@ -516,10 +531,4 @@ Het {0} Team.</value>
<value>Week</value>
</data>
<data name="Support_AccountValidation" xml:space="preserve">
<value>Elk account wordt gevalideerd bij de administrator, dus wees geduldig en controleer later opnieuw</value>
</data>
<data name="Support_ThanksRegister" xml:space="preserve">
<value>Bedankt voor het registreren</value>
</data>
</root>

View File

@ -142,10 +142,10 @@
<value>Compilações</value>
</data>
<data name="Bulk_Instructions" xml:space="preserve">
<value>Adicione múltiplas compilações em baixo escrevendo a string completa da compilação, cada um em cada linha. Todas as compilações adicionadas por esta página serão consideradas do tipo de fonte "Vazamento Privado".</value>
<value>Adicione múltiplas compilações em baixo escrevendo a string completa da compilação, cada uma em cada linha. Todas as compilações adicionadas por esta página serão consideradas do tipo de fonte "Vazamento Privado".</value>
</data>
<data name="Bulk_SendNotifications" xml:space="preserve">
<value>Enviar Notificações</value>
<value>Enviar notificações</value>
</data>
<data name="Bulk_Success" xml:space="preserve">
<value>Estas compilações foram adicionadas com sucesso.</value>
@ -154,11 +154,14 @@
<value>Adicionar compilação</value>
</data>
<data name="Common_AddBulk" xml:space="preserve">
<value>Adicionar em Massa</value>
<value>Adicionar em massa</value>
</data>
<data name="Common_Admin" xml:space="preserve">
<value>Administrador</value>
</data>
<data name="Common_Blog" xml:space="preserve">
<value>Blog</value>
</data>
<data name="Common_ChangePassword" xml:space="preserve">
<value>Alterar palavra-passe</value>
</data>
@ -201,6 +204,9 @@
<data name="Common_ThemeLight" xml:space="preserve">
<value>Claro</value>
</data>
<data name="Common_ThemeWinter" xml:space="preserve">
<value>Inverno</value>
</data>
<data name="Common_TitlePage" xml:space="preserve">
<value>|Página {0}</value>
</data>
@ -227,7 +233,7 @@ A equipa do {0}.
<value>{0}: Por favor verifique o seu endereço de correio eletrónico.</value>
</data>
<data name="Front_About" xml:space="preserve">
<value>Acerca do</value>
<value>Acerca</value>
</data>
<data name="Front_AboutSite" xml:space="preserve">
<value>Acerca do {0}</value>
@ -238,6 +244,12 @@ A equipa do {0}.
<data name="Front_Comments" xml:space="preserve">
<value>Comentários</value>
</data>
<!--
<data name="Front_CurrentAnalog" xml:space="preserve">
<value>[!!! Çúřřèñƭ Hôô£èñƨ !!!]</value>
</data>
-->
<data name="Front_CurrentCanary" xml:space="preserve">
<value>Atualmente no Canário</value>
</data>
@ -356,7 +368,7 @@ A equipa do {0}.
<value>Tempo de modificação</value>
</data>
<data name="Model_Revision" xml:space="preserve">
<value>Resvisão de Compilação</value>
<value>Revisão da Compilação</value>
</data>
<data name="Model_SourceDetails" xml:space="preserve">
<value>Detalhes da fonte</value>
@ -407,7 +419,7 @@ A equipa do {0}.
<value>Laboratório</value>
</data>
<data name="Search_Query" xml:space="preserve">
<value>Termos da procura</value>
<value>Termos da pesquisa</value>
</data>
<data name="Search_Source" xml:space="preserve">
<value>Fonte</value>
@ -424,6 +436,9 @@ A equipa do {0}.
<data name="Search_Year" xml:space="preserve">
<value>Ano</value>
</data>
<data name="Support_AccountValidation" xml:space="preserve">
<value>Todas as contas são validadas por um Administrador, por isso seja paciente e verifique mais tarde</value>
</data>
<data name="Support_AdditionsToBuildFeed" xml:space="preserve">
<value>Adições para o BuildFeed</value>
</data>
@ -445,7 +460,7 @@ A equipa do {0}.
<!--
<data name="Support_EmailValidationContent" xml:space="preserve">
<value>[!!! Âñ Ʋáℓïδáƭïôñ ℓïñƙ λáƨ βèèñ ƨèñƭ ƭô ¥ôúř è₥áïℓ áδδřèƨƨ. Þℓèáƨè çℓïçƙ ƭλè ℓïñƙ ïñ ƭλè è₥áïℓ ƭô Ʋèř ƭλè áççôúñƭ. ℓôřè₥ ïƥƨú₥ δôℓô !!!]</value>
<value>[!!!  Ʋáℓïδáƭïôñ ℓïñƙ λáƨ βèèñ ƨèñƭ ƭô ¥ôúř è₥áïℓ áδδřèƨƨ. Þℓèáƨè çℓïçƙ ƭλè ℓïñƙ ïñ ƭλè è₥áïℓ ƭô Ʋèř ƭλè áççôúñƭ. ℓôřè₥ ïƥƨú₥ δôℓô !!!]</value>
</data>
-->
<data name="Support_EmailValidationTitle" xml:space="preserve">
@ -497,10 +512,13 @@ A equipa do {0}.
<value>Vazado Recentemente</value>
</data>
<data name="Support_Register" xml:space="preserve">
<value>Registrar</value>
<value>Registar</value>
</data>
<data name="Support_RememberMe" xml:space="preserve">
<value>Lembrar-se de mim</value>
<value>Memorizar-me</value>
</data>
<data name="Support_ThanksRegister" xml:space="preserve">
<value>Obrigado por se registar</value>
</data>
<data name="Support_UserName" xml:space="preserve">
<value>Nome de Utilizador</value>
@ -521,10 +539,4 @@ A equipa do {0}.
<value>Semana</value>
</data>
<data name="Support_AccountValidation" xml:space="preserve">
<value>Todas as contas são validadas por um Administrador, por isso seja paciente e verifique mais tarde</value>
</data>
<data name="Support_ThanksRegister" xml:space="preserve">
<value>Obrigado por se regristar</value>
</data>
</root>

View File

@ -242,6 +242,9 @@
<data name="Front_Comments" xml:space="preserve">
<value>[!!! Çô₥₥èñƭƨ !!!]</value>
</data>
<data name="Front_CurrentAnalog" xml:space="preserve">
<value>[!!! Çúřřèñƭ Hôô£èñƨ !!!]</value>
</data>
<data name="Front_CurrentCanary" xml:space="preserve">
<value>[!!! Çúřřèñƭ Çáñář¥ !!!]</value>
</data>

View File

@ -242,6 +242,9 @@ The {0} Team.</value>
<data name="Front_Comments" xml:space="preserve">
<value>Comments</value>
</data>
<data name="Front_CurrentAnalog" xml:space="preserve">
<value>Current HoloLens</value>
</data>
<data name="Front_CurrentCanary" xml:space="preserve">
<value>Current Canary</value>
</data>

View File

@ -35,7 +35,7 @@
<Version>6.2.2</Version>
</PackageReference>
<PackageReference Include="HtmlAgilityPack">
<Version>1.7.2</Version>
<Version>1.7.4</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNet.Mvc">
<Version>5.2.4</Version>

View File

@ -249,35 +249,47 @@ public async Task<Dictionary<ProjectFamily, FrontPage>> SelectFrontPage()
{
var fp = new FrontPage
{
CurrentCanary = results.Where(g => g.Key.Family == family && !g.Key.LabUrl.Contains("xbox"))
CurrentCanary = results.Where(g => (g.Key.Family == family)
&& !g.Key.LabUrl.Contains("xbox")
&& !g.Key.LabUrl.Contains("analog"))
.SelectMany(g => g.Items)
.OrderByDescending(b => b.BuildTime)
.FirstOrDefault(),
CurrentInsider = results
.Where(g => g.Key.Family == family
.Where(g => (g.Key.Family == family)
&& !g.Key.LabUrl.Contains("xbox")
&& (g.Key.SourceType == TypeOfSource.PublicRelease
|| g.Key.SourceType == TypeOfSource.UpdateGDR))
&& !g.Key.LabUrl.Contains("analog")
&& ((g.Key.SourceType == TypeOfSource.PublicRelease)
|| (g.Key.SourceType == TypeOfSource.UpdateGDR)))
.SelectMany(g => g.Items)
.OrderByDescending(b => b.BuildTime)
.FirstOrDefault(),
CurrentRelease = results
.Where(g => (int)g.Key.Family <= CURRENT_RELEASE
&& g.Key.Family == family
.Where(g => ((int)g.Key.Family <= CURRENT_RELEASE)
&& (g.Key.Family == family)
&& g.Key.LabUrl.Contains("_release")
&& !g.Key.LabUrl.Contains("xbox")
&& (g.Key.SourceType == TypeOfSource.PublicRelease
|| g.Key.SourceType == TypeOfSource.UpdateGDR))
&& !g.Key.LabUrl.Contains("analog")
&& ((g.Key.SourceType == TypeOfSource.PublicRelease)
|| (g.Key.SourceType == TypeOfSource.UpdateGDR)))
.SelectMany(g => g.Items)
.OrderByDescending(b => b.BuildTime)
.FirstOrDefault(),
CurrentXbox =
results.Where(g
=> (int)g.Key.Family >= CURRENT_XBOX
&& g.Key.Family == family
=> ((int)g.Key.Family >= CURRENT_XBOX)
&& (g.Key.Family == family)
&& g.Key.LabUrl.Contains("xbox"))
.SelectMany(g => g.Items)
.OrderByDescending(b => b.BuildTime)
.FirstOrDefault(),
CurrentAnalog =
results.Where(g
=> ((int)g.Key.Family >= CURRENT_RELEASE)
&& (g.Key.Family == family)
&& g.Key.LabUrl.Contains("analog"))
.SelectMany(g => g.Items)
.OrderByDescending(b => b.BuildTime)
.FirstOrDefault()
};

View File

@ -11,6 +11,7 @@ public class FrontPage
public FrontPageBuild CurrentInsider { get; set; }
public FrontPageBuild CurrentRelease { get; set; }
public FrontPageBuild CurrentXbox { get; set; }
public FrontPageBuild CurrentAnalog { get; set; }
}
public class FrontPageBuild

View File

@ -0,0 +1,26 @@
@using BuildFeed.Model.View
@helper LatestBuild(string title, FrontPageBuild build)
{
<h4 class="latest-flex-title">@title</h4>
<div class="latest-flex-detail">
<p class="latest-flex-build">
@if (build.Revision.HasValue)
{
@($"{build.Number}.{build.Revision}")
}
else
{
@build.Number
}
</p>
<p class="latest-flex-lab">
@build.Lab
</p>
@if (build.BuildTime.HasValue)
{
<p class="latest-flex-time">
@build.BuildTime.Value.ToString("HH:mm, dddd dd MMMM yyyy")
</p>
}
</div>
}

View File

@ -66,19 +66,28 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="HtmlAgilityPack" Version="1.7.2" />
<PackageReference Include="HtmlAgilityPack" Version="1.7.4" />
<PackageReference Include="Microsoft.AspNet.Mvc">
<Version>5.2.4</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNet.Razor">
<Version>3.2.4</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNet.WebApi">
<Version>5.2.4</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNet.WebPages">
<Version>3.2.4</Version>
</PackageReference>
<PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
<Version>1.0.8</Version>
</PackageReference>
<PackageReference Include="Microsoft.Net.Compilers">
<Version>2.7.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Web.Infrastructure">
<Version>1.0.0</Version>
</PackageReference>
<PackageReference Include="MSBuildGitHash">
<Version>0.3.0</Version>
</PackageReference>
@ -146,6 +155,7 @@
<ItemGroup>
<Content Include="BingSiteAuth.xml" />
<Content Include="browserconfig.xml" />
<Content Include="App_Code\BuildHelpers.cshtml" />
<None Include="gulpfile.js" />
<None Include="res\css\inc\_christmas.scss" />
<None Include="package-lock.json">

View File

@ -37,12 +37,7 @@
{
family.CurrentCanary.Id
})" class="latest-flex-item latest-flex-red">
<h4 class="latest-flex-title">@VariantTerms.Front_CurrentCanary</h4>
<div class="latest-flex-detail">
<p class="latest-flex-build">@(family.CurrentCanary.Number).@(family.CurrentCanary.Revision)</p>
<p class="latest-flex-lab">@family.CurrentCanary.Lab</p>
<p class="latest-flex-time">@(family.CurrentCanary.BuildTime?.ToString("HH:mm, dddd dd MMMM yyyy"))</p>
</div>
@BuildHelpers.LatestBuild(VariantTerms.Front_CurrentCanary, family.CurrentCanary)
</a>
}
@if (family.CurrentInsider != null && family.CurrentInsider.Id != family.CurrentRelease?.Id)
@ -51,12 +46,7 @@
{
family.CurrentInsider.Id
})" class="latest-flex-item latest-flex-yellow">
<h4 class="latest-flex-title">@VariantTerms.Front_CurrentInsider</h4>
<div class="latest-flex-detail">
<p class="latest-flex-build">@(family.CurrentInsider.Number).@(family.CurrentInsider.Revision)</p>
<p class="latest-flex-lab">@family.CurrentInsider.Lab</p>
<p class="latest-flex-time">@(family.CurrentInsider.BuildTime?.ToString("HH:mm, dddd dd MMMM yyyy"))</p>
</div>
@BuildHelpers.LatestBuild(VariantTerms.Front_CurrentInsider, family.CurrentInsider)
</a>
}
@if (family.CurrentRelease != null)
@ -65,12 +55,16 @@
{
family.CurrentRelease.Id
})" class="latest-flex-item latest-flex-blue">
<h4 class="latest-flex-title">@VariantTerms.Front_CurrentRelease</h4>
<div class="latest-flex-detail">
<p class="latest-flex-build">@(family.CurrentRelease.Number).@(family.CurrentRelease.Revision)</p>
<p class="latest-flex-lab">@family.CurrentRelease.Lab</p>
<p class="latest-flex-time">@(family.CurrentRelease.BuildTime?.ToString("HH:mm, dddd dd MMMM yyyy"))</p>
</div>
@BuildHelpers.LatestBuild(VariantTerms.Front_CurrentRelease, family.CurrentRelease)
</a>
}
@if (family.CurrentAnalog != null)
{
<a href="@Url.Action(nameof(FrontController.ViewBuild), new
{
family.CurrentAnalog.Id
})" class="latest-flex-item latest-flex-purple">
@BuildHelpers.LatestBuild(VariantTerms.Front_CurrentAnalog, family.CurrentAnalog)
</a>
}
@if (family.CurrentXbox != null)
@ -79,12 +73,7 @@
{
family.CurrentXbox.Id
})" class="latest-flex-item latest-flex-green">
<h4 class="latest-flex-title">@VariantTerms.Front_CurrentXbox</h4>
<div class="latest-flex-detail">
<p class="latest-flex-build">@(family.CurrentXbox.Number).@(family.CurrentXbox.Revision)</p>
<p class="latest-flex-lab">@family.CurrentXbox.Lab</p>
<p class="latest-flex-time">@(family.CurrentXbox.BuildTime?.ToString("HH:mm, dddd dd MMMM yyyy"))</p>
</div>
@BuildHelpers.LatestBuild(VariantTerms.Front_CurrentXbox, family.CurrentXbox)
</a>
}
</div>

View File

@ -1551,16 +1551,71 @@
}
},
"gulp-sass": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-3.2.1.tgz",
"integrity": "sha512-UATbRpSDsyXCnpYSPBUEvdvtSEzksJs7/oQ0CujIpzKqKrO6vlnYwhX2UTsGrf4rNLwqlSSaM271It0uHYvJ3Q==",
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-4.0.1.tgz",
"integrity": "sha512-OMQEgWNggpog8Tc5v1MuI6eo+5iiPkVeLL76iBhDoEEScLUPfZlpvzmgTnLkpcqdrNodZxpz5qcv6mS2rulk3g==",
"dev": true,
"requires": {
"gulp-util": "3.0.8",
"chalk": "2.3.2",
"lodash.clonedeep": "4.5.0",
"node-sass": "4.8.3",
"plugin-error": "1.0.1",
"replace-ext": "1.0.0",
"strip-ansi": "4.0.0",
"through2": "2.0.3",
"vinyl-sourcemaps-apply": "0.2.1"
},
"dependencies": {
"ansi-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
"dev": true
},
"ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"dev": true,
"requires": {
"color-convert": "1.9.1"
}
},
"chalk": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
"integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
"dev": true,
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
"supports-color": "5.3.0"
}
},
"replace-ext": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
"integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
"dev": true
},
"strip-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
"ansi-regex": "3.0.0"
}
},
"supports-color": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
"integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
"dev": true,
"requires": {
"has-flag": "3.0.0"
}
}
}
},
"gulp-sourcemaps": {

View File

@ -9,7 +9,7 @@
"gulp": "3.9.1",
"gulp-autoprefixer": "5.0.0",
"gulp-clean-css": "3.9.3",
"gulp-sass": "3.2.1",
"gulp-sass": "4.0.1",
"gulp-sourcemaps": "2.6.4",
"gulp-typescript": "4.0.2",
"gulp-uglify-es": "1.0.1",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -659,6 +659,16 @@ article
}
}
&.latest-flex-purple
{
border-color: $strong-purple;
h4.latest-flex-title
{
background: $strong-purple;
}
}
.latest-flex-detail
{
text-align: center;

View File

@ -7,6 +7,7 @@ $strong-red: #A72F3B;
$strong-yellow: #F5B83D;
$strong-green: #76B540;
$strong-blue: #4076B5;
$strong-purple: #7E3FB5;
@mixin standard-box-shadow($color)
{

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long