Permalink
Browse files

Update branch with upstream dev

  • Loading branch information...
ralarcon committed Dec 14, 2017
1 parent 5531bf1 commit 27082a75acad71828c2d20b0b41d078675e204e0
Showing 1,849 changed files with 38,401 additions and 1,002 deletions.
@@ -257,3 +257,8 @@ paket-files/
*.sln.iml
templates/_composition/_shared/Page.Chart.SampleDataService/Services/SampleDataService_postaction.cs
/myModel.vsdx
/code/SynchronizeFilesUsedByVisualBasicTemplates.ps1
/code/PrismTests.playlist
/code/AllButWhack.playlist
/code/tools/Localization/Localization.sln
/code/FinalTests.playlist
@@ -25,7 +25,7 @@ I need an app that uses MVVM Light, uses master detail, can suspend and resume,
> The builds include test verifications to validate the contributions:
> * *CI Build*: Includes all unit test + minimum integration verifications (minumum generation + build + code style rules). Runs every PR requested / PR accepted.
> * *CI Build*: Includes all unit test + minimum integration verifications (minimum generation + build + code style rules). Runs every PR requested / PR accepted.
> * *Gen Tests*: Includes tests to verify combinations and variations of templates from a project generation point of view. Runs every PR accepted and takes a bit to complete.
> * *Full Tests*: Includes `Gen Tests` and actually builds the solutions generated to ensure no build time issues found. Runs every PR accepted and takes longer to be completed.
> * *Wack Tests*: Includes tests that run the App Certification Kit against the generated projects to ensure there are no issues blocking a submission to the store. Runs once nightly and takes quite a while to complete.
@@ -63,7 +63,7 @@ Here is what we're currently thinking in our [roadmap](docs/roadmap.md).
## Contributing
Do you want to contribute? We would love to have you help out. Here are our [contribution guidelines](CONTRIBUTING.md).
Do you want to contribute? We would love to have you help out. Here are our [contribution guidelines](CONTRIBUTING.md).
## Principles
@@ -6,7 +6,7 @@ $testrunnerPath = Join-Path $rootPath \Code\packages\xunit.runner.console.2.2.0\
$templateTestLibraryPath = Join-Path $rootPath \Code\test\Templates.Test\bin\Analyze\Microsoft.Templates.Test.dll
$coreTestLibraryPath = Join-Path $rootPath \Code\test\Core.Test\bin\Analyze\Microsoft.Templates.Core.Test.dll
$uiTestLibraryPath = Join-Path $rootPath \Code\test\UI.Test\bin\Analyze\Microsoft.UI.Test.dll
$traits = 'ExecutionSet=BuildCodeBehind', 'ExecutionSet=BuildMVVMBasic','ExecutionSet=BuildMVVMLight','ExecutionSet=BuildCaliburnMicro', 'ExecutionSet=BuildStyleCop', 'ExecutionSet=TemplateValidation', 'ExecutionSet=BuildRightClickWithLegacy'
$traits = 'ExecutionSet=BuildCodeBehind', 'ExecutionSet=BuildMVVMBasic','ExecutionSet=BuildMVVMLight','ExecutionSet=BuildCaliburnMicro','ExecutionSet=BuildPrism', 'ExecutionSet=BuildStyleCop', 'ExecutionSet=TemplateValidation', 'ExecutionSet=BuildRightClickWithLegacy'
$outputDir = 'C:\temp\testresults'
if (-not (Test-Path $outputDir))
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\templates\latest\Templates.mstx" signType="100040160" dest="__OUTPATHROOT__\templates\latest\Templates.mstx" />
<file src="__INPATHROOT__\templates\###VersionedTemplateFile###" signType="100040160" dest="__OUTPATHROOT__\templates\###VersionedTemplateFile###" />
<file src="__INPATHROOT__\templates\Templates.mstx" signType="100040160" dest="__OUTPATHROOT__\templates\Templates.mstx" />
</job>
</SignConfigXML>
</SignConfigXML>
@@ -26,8 +26,8 @@ Foreach ($t in $allTemplates)
}
# Output the name of the template that needs a VB equivalent
# Exclude CaliburnMicro templates while not supporting VB (yet)
if (-not $hasVbEquivalent -and $t -notmatch "Caliburn")
# Exclude CaliburnMicro & Prism templates while not supporting VB (yet)
if (-not $hasVbEquivalent -and $t -notmatch "Caliburn" -and $t -notmatch "Prism")
{
# This will be the path of the folder that needs a VB version
$templateName = $t -replace "\\.template.config\\template.json", ""
@@ -69,27 +69,27 @@
</Reference>
<Reference Include="Microsoft.TemplateEngine.Abstractions, Version=1.0.0.234, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.TemplateEngine.Abstractions.1.0.0-beta2-20170518-234\lib\net45\Microsoft.TemplateEngine.Abstractions.dll</HintPath>
<Private>True</Private>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.TemplateEngine.Core, Version=1.0.0.234, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.TemplateEngine.Core.1.0.0-beta2-20170518-234\lib\net45\Microsoft.TemplateEngine.Core.dll</HintPath>
<Private>True</Private>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.TemplateEngine.Core.Contracts, Version=1.0.0.234, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.TemplateEngine.Core.Contracts.1.0.0-beta2-20170518-234\lib\net45\Microsoft.TemplateEngine.Core.Contracts.dll</HintPath>
<Private>True</Private>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.TemplateEngine.Edge, Version=1.0.0.234, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.TemplateEngine.Edge.1.0.0-beta2-20170518-234\lib\net45\Microsoft.TemplateEngine.Edge.dll</HintPath>
<Private>True</Private>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Version=1.0.0.234, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.1.0.0-beta2-20170518-234\lib\net45\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.dll</HintPath>
<Private>True</Private>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.TemplateEngine.Utils, Version=1.0.0.234, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.TemplateEngine.Utils.1.0.0-beta2-20170518-234\lib\net45\Microsoft.TemplateEngine.Utils.dll</HintPath>
<Private>True</Private>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Telemetry, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.VisualStudio.Telemetry.15.3.789-masterCC863119\lib\net45\Microsoft.VisualStudio.Telemetry.dll</HintPath>
@@ -20,7 +20,7 @@ public RelayCommand(Action execute)
public RelayCommand(Action execute, Func<bool> canExecute)
{
_execute = execute ?? throw new ArgumentNullException("execute");
_execute = execute ?? throw new ArgumentNullException(nameof(execute));
_canExecute = canExecute;
}
@@ -58,7 +58,7 @@ public RelayCommand(Action<T> execute)
public RelayCommand(Action<T> execute, Func<T, bool> canExecute)
{
_execute = execute ?? throw new ArgumentNullException("execute");
_execute = execute ?? throw new ArgumentNullException(nameof(execute));
_canExecute = canExecute;
}
@@ -132,7 +132,7 @@ public static List<string> HandleRemovals(this IEnumerable<string> source, IEnum
var startIndex = mergeString.IndexOf(MacroStartDelete, StringComparison.OrdinalIgnoreCase);
var endIndex = mergeString.IndexOf(MacroEndDelete, StringComparison.OrdinalIgnoreCase);
if (startIndex > 0 && endIndex > startIndex)
while (startIndex > 0 && endIndex > startIndex)
{
// VB uses a single character (') to start the comment, C# uses two (//)
int commentIndicatorLength = mergeString[startIndex - 1] == '\'' ? 1 : 2;
@@ -142,6 +142,9 @@ public static List<string> HandleRemovals(this IEnumerable<string> source, IEnum
(endIndex - commentIndicatorLength) - (startIndex - commentIndicatorLength) - (MacroStartDelete.Length + commentIndicatorLength));
sourceString = sourceString.Replace(toRemove, string.Empty);
mergeString = mergeString.Substring(endIndex + MacroEndDelete.Length);
startIndex = mergeString.IndexOf(MacroStartDelete, StringComparison.InvariantCultureIgnoreCase);
endIndex = mergeString.IndexOf(MacroEndDelete, StringComparison.InvariantCultureIgnoreCase);
}
return sourceString.Split(new[] { Environment.NewLine }, StringSplitOptions.None).ToList();
@@ -155,7 +158,7 @@ public static List<string> RemoveRemovals(this IEnumerable<string> merge)
var startIndex = mergeString.IndexOf(MacroStartDelete, StringComparison.OrdinalIgnoreCase);
var endIndex = mergeString.IndexOf(MacroEndDelete, StringComparison.OrdinalIgnoreCase);
if (startIndex > 0 && endIndex > startIndex)
while (startIndex > 0 && endIndex > startIndex)
{
// VB uses a single character (') to start the comment, C# uses two (//)
int commentIndicatorLength = mergeString[startIndex - 1] == '\'' ? 1 : 2;
@@ -168,6 +171,8 @@ public static List<string> RemoveRemovals(this IEnumerable<string> merge)
}
mergeString = mergeString.Remove(startIndex - commentIndicatorLength, lengthOfDeletion);
startIndex = mergeString.IndexOf(MacroStartDelete, StringComparison.InvariantCultureIgnoreCase);
endIndex = mergeString.IndexOf(MacroEndDelete, StringComparison.InvariantCultureIgnoreCase);
}
return mergeString.Split(new[] { Environment.NewLine }, StringSplitOptions.None).ToList();
@@ -142,7 +142,7 @@ public FlowDocument Transform(string text)
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
text = Normalize(text);
@@ -167,7 +167,7 @@ private IEnumerable<Block> RunBlockGamut(string text)
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
return DoHeaders(
@@ -199,7 +199,7 @@ private IEnumerable<Inline> RunSpanGamut(string text)
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
return DoCodeSpans(
@@ -241,7 +241,7 @@ private IEnumerable<Block> FormParagraphs(string text)
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
// split on two or more newlines
@@ -393,7 +393,7 @@ private IEnumerable<Inline> DoImages(string text, Func<string, IEnumerable<Inlin
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
return Evaluate(text, _imageInline, ImageInlineEvaluator, defaultHandler);
@@ -403,7 +403,7 @@ private Inline ImageInlineEvaluator(Match match)
{
if (match == null)
{
throw new ArgumentNullException("match");
throw new ArgumentNullException(nameof(match));
}
string linkText = match.Groups[2].Value;
@@ -469,7 +469,7 @@ private IEnumerable<Inline> DoAnchors(string text, Func<string, IEnumerable<Inli
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
// Next, inline-style links: [link text](url "optional title") or [link text](url "optional title")
@@ -480,7 +480,7 @@ private Inline AnchorInlineEvaluator(Match match)
{
if (match == null)
{
throw new ArgumentNullException("match");
throw new ArgumentNullException(nameof(match));
}
string linkText = match.Groups[2].Value;
@@ -538,7 +538,7 @@ private IEnumerable<Block> DoHeaders(string text, Func<string, IEnumerable<Block
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
return Evaluate<Block>(
@@ -552,7 +552,7 @@ private Block SetextHeaderEvaluator(Match match)
{
if (match == null)
{
throw new ArgumentNullException("match");
throw new ArgumentNullException(nameof(match));
}
string header = match.Groups[1].Value;
@@ -566,7 +566,7 @@ private Block AtxHeaderEvaluator(Match match)
{
if (match == null)
{
throw new ArgumentNullException("match");
throw new ArgumentNullException(nameof(match));
}
string header = match.Groups[2].Value;
@@ -578,7 +578,7 @@ public Block CreateHeader(int level, IEnumerable<Inline> content)
{
if (content == null)
{
throw new ArgumentNullException("content");
throw new ArgumentNullException(nameof(content));
}
var block = Create<Paragraph, Inline>(content);
@@ -646,7 +646,7 @@ private IEnumerable<Block> DoHorizontalRules(string text, Func<string, IEnumerab
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
return Evaluate(text, _horizontalRules, RuleEvaluator, defaultHandler);
@@ -656,7 +656,7 @@ private Block RuleEvaluator(Match match)
{
if (match == null)
{
throw new ArgumentNullException("match");
throw new ArgumentNullException(nameof(match));
}
var line = new Line();
@@ -712,7 +712,7 @@ private IEnumerable<Block> DoLists(string text, Func<string, IEnumerable<Block>>
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
// We use a different prefix before nested lists than top-level lists.
@@ -725,7 +725,7 @@ private Block ListEvaluator(Match match)
{
if (match == null)
{
throw new ArgumentNullException("match");
throw new ArgumentNullException(nameof(match));
}
string list = match.Groups[1].Value;
@@ -800,7 +800,7 @@ private ListItem ListItemEvaluator(Match match)
{
if (match == null)
{
throw new ArgumentNullException("match");
throw new ArgumentNullException(nameof(match));
}
string item = match.Groups[4].Value;
@@ -834,7 +834,7 @@ private IEnumerable<Inline> DoCodeSpans(string text, Func<string, IEnumerable<In
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
//// * You can use multiple backticks as the delimiters if you want to
@@ -866,7 +866,7 @@ private Inline CodeSpanEvaluator(Match match)
{
if (match == null)
{
throw new ArgumentNullException("match");
throw new ArgumentNullException(nameof(match));
}
string span = match.Groups[2].Value;
@@ -905,7 +905,7 @@ private IEnumerable<Inline> DoItalicsAndBold(string text, Func<string, IEnumerab
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
// <strong> must go first, then <em>
@@ -931,7 +931,7 @@ private Inline ItalicEvaluator(Match match, int contentGroup)
{
if (match == null)
{
throw new ArgumentNullException("match");
throw new ArgumentNullException(nameof(match));
}
var content = match.Groups[contentGroup].Value;
@@ -942,7 +942,7 @@ private Inline BoldEvaluator(Match match, int contentGroup)
{
if (match == null)
{
throw new ArgumentNullException("match");
throw new ArgumentNullException(nameof(match));
}
var content = match.Groups[contentGroup].Value;
@@ -969,7 +969,7 @@ private string Normalize(string text)
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
var output = new StringBuilder(text.Length);
@@ -1043,7 +1043,7 @@ private static string RepeatString(string data, int count)
{
if (data == null)
{
throw new ArgumentNullException("data");
throw new ArgumentNullException(nameof(data));
}
var sb = new StringBuilder(data.Length * count);
@@ -1071,7 +1071,7 @@ private IEnumerable<T> Evaluate<T>(string text, Regex expression, Func<Match, T>
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
var matches = expression.Matches(text);
@@ -1108,7 +1108,7 @@ public IEnumerable<Inline> DoText(string text)
{
if (text == null)
{
throw new ArgumentNullException("text");
throw new ArgumentNullException(nameof(text));
}
var t = _eoln.Replace(text, " ");
Oops, something went wrong.

0 comments on commit 27082a7

Please sign in to comment.