Merge pull request #2228 from Microsoft/dev

Sync from dev

Author: sibille

_utils/Identify-CSharp-Template-Commits-Without-VisualBasic-Equivalents.ps1

@@ -7,7 +7,7 @@
 ## This script cannot be perfect in identifying everything. It should be used in combination with the script that looks at file last-modified times.
 
 # last param is the SHA of the commit to check from (this should normally be the last release)
-$files = git diff --name-only df0f996d22e0847337ee54aec72c50aa5bf21614
+$files = git diff --name-only 7a4c807bf03ad0b3f8fff045752e1b3375603b67
 
 function Get-CsEquivalentFile($vbfile)
 {

_utils/Identify-CSharp-Templates-Changed-More-Recently-Than-VisualBasic-Equivalents.ps1

@@ -12,7 +12,7 @@ function Get-CsEquivalentFile($vbfile)
 }
 
 # Get list of all templates
-$allTemplates = Get-ChildItem ..\templates\* -Recurse -include template.json | where { $_.FullName -notmatch "\\templates\\test\\" } | % { Write-Output $_.FullName }
+$allTemplates = Get-ChildItem ..\templates\* -Recurse -include template.json | where { $_.FullName -notmatch "\\templates\\Uwp\\test\\" } | % { Write-Output $_.FullName }
 Foreach ($t in $allTemplates)
 {
     # find VB ones

_utils/List-CSharp-Templates-Without-VisualBasic-Equivalents.ps1

@@ -1,5 +1,5 @@
 # Get list of all templates
-$allTemplates = Get-ChildItem ..\templates\* -Recurse -include template.json | where { $_.FullName -notmatch "\\templates\\test\\" } | % { Write-Output $_.FullName }
+$allTemplates = Get-ChildItem ..\templates\* -Recurse -include template.json | where { $_.FullName -notmatch "\\templates\\Uwp\\test\\" } | % { Write-Output $_.FullName }
 Foreach ($t in $allTemplates)
 {
     # Ignore VB ones

_utils/Synchronize-Files-Used-By-VisualBasic-Templates.ps1

@@ -3,10 +3,10 @@
 # This is necessary because the way template folders are copied and filtered means that, for example, the VB templates can't point to files in the C# folders.
 
 # This script finds all interested files in VB folders and then copies the equivalent file from the CS version
-Get-ChildItem ..\templates\* -Recurse -include *.xaml, *.resw, *.md, *.png, Package.appxmanifest | where { $_.FullName -Match "VB\\" -and ($_.FullName -notmatch "\\templates\\test\\") } | % { $cs = $_.FullName -replace "VB\\", "\\"; Copy-Item $cs $_.FullName }
+Get-ChildItem ..\templates\* -Recurse -include *.xaml, *.resw, *.md, *.png, Package.appxmanifest | where { $_.FullName -Match "VB\\" -and ($_.FullName -notmatch "\\templates\\Uwp\\test\\") } | % { $cs = $_.FullName -replace "VB\\", "\\"; Copy-Item $cs $_.FullName }
 
 # This script handles project file postactions that add 3rd party references
-Get-ChildItem ..\templates\* -Recurse -include _postaction.vbproj | where { $_.FullName -notmatch "\\templates\\test\\" } | % { $cs = $_.FullName -replace "VB\\", "\\"; $cs = $cs -replace ".vbproj", ".csproj"; Copy-Item $cs $_.FullName }
+Get-ChildItem ..\templates\* -Recurse -include _postaction.vbproj | where { $_.FullName -notmatch "\\templates\\Uwp\\test\\" } | % { $cs = $_.FullName -replace "VB\\", "\\"; $cs = $cs -replace ".vbproj", ".csproj"; Copy-Item $cs $_.FullName }
 
 # Formats JSON in a nicer format than the built-in ConvertTo-Json does.
 # This is based on code from https://github.com/PowerShell/PowerShell/issues/2736 and will be built into PS6.0
@@ -31,7 +31,7 @@ function Format-Json([Parameter(Mandatory, ValueFromPipeline)][String] $json) {
 
 # This script updates all the localized string values in VB template files from their C# equivalents.
 # This is needed as the files can't just be copied as they have VB specific content.
-Get-ChildItem ..\templates\* -Recurse -include *template.json | where { $_.FullName -Match "VB\\" -and ($_.FullName -notmatch "\\templates\\test\\") } |  % { 
+Get-ChildItem ..\templates\* -Recurse -include *template.json | where { $_.FullName -Match "VB\\" -and ($_.FullName -notmatch "\\templates\\Uwp\\test\\") } |  % { 
 
     $vbFile = $_.FullName;
     $csFile = $_.FullName -replace "VB\\", "\\"; 

_utils/Synchronize-Localization-Files-Used-By-Prism-Templates.ps1

@@ -20,7 +20,7 @@ function Format-Json([Parameter(Mandatory, ValueFromPipeline)][String] $json) {
 
 # This script updates all the localized string values in Prism template files from their C# equivalents.
 # This is needed as the files can't just be copied as they have Prism specific content.
-[string[]] $templatesPath = "..\templates\Pages","..\templates\Features";
+[string[]] $templatesPath = "..\templates\Uwp\Pages","..\templates\Uwp\Features";
 
 Get-ChildItem $templatesPath -Recurse -include *template.json | where { $_.FullName -Match ".Prism\\" } |  % { 
 

code/Big.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2010
+VisualStudioVersion = 15.0.27130.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{481CC407-92E7-42A9-AD6E-AA157E5D40C3}"
 EndProject

code/Test.sln

@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\Core\Core.cspro
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{11848CF0-5EFE-419F-9261-47F683109F96}"
 	ProjectSection(SolutionItems) = preProject
-		_tools\NuGet.exe = _tools\NuGet.exe
+		tools\nuget.exe = tools\nuget.exe
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI", "src\UI\UI.csproj", "{DCFD282D-D91C-49B5-8DBF-D943BAFEF5AA}"

code/src/Core/Configuration/BreakingChangeVersion.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Microsoft.Templates.Core
+{
+    public class BreakingChangeVersion
+    {
+        public string Name { get; set; }
+
+        public Version BreakingVersion { get; set; }
+    }
+}

code/src/Core/Configuration/Configuration.cs

@@ -9,7 +9,6 @@
 using System.IO;
 using System.Reflection;
 using System.Text;
-
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -40,6 +39,8 @@ public class Configuration
 
         public List<string> AllowedPublicKeysPins { get; set; } = new List<string>() { };
 
+        public List<BreakingChangeVersion> BreakingChangesVersions { get; set; } = new List<BreakingChangeVersion>() { };
+
         public string CustomTelemetryEndpoint { get; set; } = string.Empty;
 
         public string GitHubDocsUrl { get; set; } = "https://github.com/Microsoft/WindowsTemplateStudio/blob/master/docs/";

code/src/Core/Configuration/WindowsTemplateStudio.tokenized.config.json

@@ -17,5 +17,11 @@
     "8A79BF09C49440C614229A2338384348443353A4B3DBA4AD46EDC0FE1054ED220A0D3445783493869186DEADBF0D9D8627E0EAC2D37475C9EC991A0324038EA4",
     "2A0A69F1AB9BB46A8AE3563B72702FD6CCB16ECBF669D62A7DC92D217A084E318EC8BB2AE87A4A2C6855BDB9C0F4FD93D77E802AAACDDEB795C2EF718D7D4890",
     "3887006BEB41CEE5386343BE28289FB8D08ED52D4DCB0907FBC4624D0EA886E9295303467AD3323D98D20703CBFBDA331680B2D8D90B3A561A98C94E05E9A021"
+  ],
+  "BreakingChangesVersions": [
+    {
+      "Name": "AddNavigationView",
+      "BreakingVersion": "###BreakingChangesAddNavigationViewVersion###"
+    }
   ]
 }