Merge pull request #2845 from Microsoft/develop

Merge develop into master.

Updates:

Adds support for Visual Studio 2017 Update 15.4.5
Update projections to target the 10.0.16299 Windows SDK
Address C++ compiler longevity issues

Frameworks/UIKit/NSLayoutConstraint.mm

@@ -23,7 +23,6 @@
 #include "NSLayoutConstraint+AutoLayout.h"
 #include "AutoLayout.h"
 
-#include <regex>
 #include <list>
 #include <sstream>
 #include <regex>
@@ -56,6 +55,8 @@
 typedef vector<Constraint> ConstraintList;
 
 bool parsePredicates(string line, PredicateList& predicates) {
+    static std::regex s_predicateRex{"^\\s*(==|>=|<=)?([\\w.]+)(@([\\w]+))?\\s*$"};
+
     // Should this be parsed differently between connectors and constraints?
     vector<string> predStr;
 
@@ -77,9 +78,8 @@ bool parsePredicates(string line, PredicateList& predicates) {
     }
 
     for (int i = 0; i < predStr.size(); i++) {
-        regex rex = regex::basic_regex("^\\s*(==|>=|<=)?([\\w.]+)(@([\\w]+))?\\s*$");
         smatch m;
-        if (!regex_search(predStr[i], m, rex)) {
+        if (!regex_search(predStr[i], m, s_predicateRex)) {
             TraceError(TAG, L"Syntax Error! %hs", predStr[i].c_str());
             return false;
         } else {
@@ -415,6 +415,15 @@ + (NSArray*)constraintsWithVisualFormat:(NSString*)format
                                 options:(NSLayoutFormatOptions)opts
                                 metrics:(NSDictionary*)metrics
                                   views:(NSDictionary*)views {
+    // ([VH]:)
+    static std::regex s_vertizontalRex{"^([VH]:).*$"};
+    // Match all "]-(1,2,3)-["
+    static std::regex s_connectorRex{"(\\]|\\|)([^\\[]*)?(\\[|\\|)"};
+    // Match all "[one(>=two,three@4)]" or "|"
+    static std::regex s_constraintRex{"(\\[([^\\]]*)\\]|\\|)"};
+    // (sub-unit of a constraint)
+    static std::regex s_constraintPartRex{"^\\[([\\w]+)(\\(.*\\))?\\]$"};
+
     UIView* superview = nil;
     NSArray* items = views.allValues;
 
@@ -448,19 +457,15 @@ + (NSArray*)constraintsWithVisualFormat:(NSString*)format
     ConstraintList constraints;
 
     // Match constraint direction
-    // ([VH]:)
-    regex vertizontalRex = regex::basic_regex("^([VH]:).*$");
     smatch vertizontalMatch;
-    if (regex_match(line, vertizontalMatch, vertizontalRex)) {
+    if (regex_match(line, vertizontalMatch, s_vertizontalRex)) {
         if (vertizontalMatch[0].str()[0] == 'V') {
             vertical = true;
         }
         line = line.substr(2);
     }
 
-    // Match all "]-(1,2,3)-["
-    regex connectorRex = regex::basic_regex("(\\]|\\|)([^\\[]*)?(\\[|\\|)");
-    sregex_iterator connectorIt(line.begin(), line.end(), connectorRex);
+    sregex_iterator connectorIt(line.begin(), line.end(), s_connectorRex);
     sregex_iterator end;
 
     while (connectorIt != end) {
@@ -490,9 +495,7 @@ + (NSArray*)constraintsWithVisualFormat:(NSString*)format
         connectorIt++;
     }
 
-    // Match all "[one(>=two,three@4)]" or "|"
-    regex constraintRex = regex::basic_regex("(\\[([^\\]]*)\\]|\\|)");
-    sregex_iterator constraintIt(line.begin(), line.end(), constraintRex);
+    sregex_iterator constraintIt(line.begin(), line.end(), s_constraintRex);
     size_t matchEnd = 0;
 
     if (constraintIt->position() != 0) {
@@ -505,9 +508,8 @@ + (NSArray*)constraintsWithVisualFormat:(NSString*)format
 #ifdef DEBUG_VISUAL_FORMAT
         TraceVerbose(TAG, L"Constraint: %hs", conStr.c_str());
 #endif
-        regex rex = regex::basic_regex("^\\[([\\w]+)(\\(.*\\))?\\]$");
         smatch m;
-        if (!regex_search(conStr, m, rex)) {
+        if (!regex_search(conStr, m, s_constraintPartRex)) {
             if (conStr == "|") {
                 constraints.push_back(Constraint(PredicateList(), conStr));
             } else {

GitVersion.yml

@@ -34,4 +34,5 @@ branches:
     is-release-branch: false
     prevent-increment-of-merged-branch-version: true
 ignore:
-  sha: []
+  sha:
+    - db05d76b7c9e9371f3edd8bb0085e260d1ad4957

README.md

@@ -88,9 +88,6 @@ When using the bridge, the first thing you'll want to do is generate a Visual St
 
 For more detailed step by step instructions on how to import a project, see the [Quick Start Tutorial](https://github.com/Microsoft/WinObjC/wiki/Quick-Start-Tutorial) page of the wiki. For vsimporter options and known issues, check the [Using vsimporter](https://github.com/Microsoft/WinObjC/wiki/Using-vsimporter) wiki page.
 
-### Analyzing your App
-After importing your project, we strongly suggest using the [App Analysis Tool](https://developer.microsoft.com/en-us/windows/bridges/ios/app-analyzer-tool) to have a better understanding of the compatibility of your app with the bridge.
-
 ### Building & Running the Samples
 A great way to learn more about the bridge and its features is building and running the samples of the SDK, which contain many code examples. We recommend starting with the **WOCCatalog** sample app, which demonstrates an assortment of iOS and XAML UI controls:
 
@@ -108,11 +105,10 @@ The following resources will help you get started. For more information, check o
 
 1. [Wiki](https://github.com/Microsoft/WinObjC/wiki), for documentation and tutorials
 2. [Development Roadmap](https://github.com/Microsoft/WinObjC/wiki/Roadmap), detailing our highest priorities
-3. [App Analysis Tool](https://developer.microsoft.com/en-us/windows/bridges/ios/app-analyzer-tool), to evaluate the compatibility of your app with the bridge
-4. [Website on Windows Dev Center](https://dev.windows.com/bridges/ios), for evaluation virtual machines
-5. [Quick Start Challenge](https://github.com/Microsoft/WinObjC/wiki/Quick-Start-Tutorial), for a quick hands-on introduction to the bridge
-7. [FAQ](https://github.com/Microsoft/WinObjC/wiki/FAQ), with common questions and issues
-8. [The iOS Bridge Samples Repo](https://github.com/Microsoft/WinObjC-Samples), for sample apps and code using the bridge
+3. [Website on Windows Dev Center](https://dev.windows.com/bridges/ios), for evaluation virtual machines
+4. [Quick Start Challenge](https://github.com/Microsoft/WinObjC/wiki/Quick-Start-Tutorial), for a quick hands-on introduction to the bridge
+5. [FAQ](https://github.com/Microsoft/WinObjC/wiki/FAQ), with common questions and issues
+6. [The iOS Bridge Samples Repo](https://github.com/Microsoft/WinObjC-Samples), for sample apps and code using the bridge
 
 ## Contributing
 There are many ways to contribute to the Windows Bridge for iOS:

build/WinObjC.Frameworks.Core/project.json

@@ -0,0 +1,25 @@
+{
+  "dependencies": {
+    "NuGet.Build.Packaging": "0.1.186"
+  },
+  "frameworks": {
+    ".NETFramework,Version=v4.0": {
+      "imports": [
+        "dotnet",
+        "netstandard1.0",
+        "netstandard1.1",
+        "netstandard1.2",
+        "netstandard1.3",
+        "netstandard1.4",
+        "netstandard1.5",
+        "netstandard1.6",
+        "net20",
+        "net35",
+        "net40",
+        "native",
+        "monoandroid",
+        "xamarinios10"
+      ]
+    }
+  }
+}

build/WinObjC.Frameworks.ThirdParty/project.json

@@ -0,0 +1,25 @@
+{
+  "dependencies": {
+    "NuGet.Build.Packaging": "0.1.186"
+  },
+  "frameworks": {
+    ".NETFramework,Version=v4.0": {
+      "imports": [
+        "dotnet",
+        "netstandard1.0",
+        "netstandard1.1",
+        "netstandard1.2",
+        "netstandard1.3",
+        "netstandard1.4",
+        "netstandard1.5",
+        "netstandard1.6",
+        "net20",
+        "net35",
+        "net40",
+        "native",
+        "monoandroid",
+        "xamarinios10"
+      ]
+    }
+  }
+}

build/WinObjC.Frameworks.UWP.Core/project.json

@@ -0,0 +1,25 @@
+{
+  "dependencies": {
+    "NuGet.Build.Packaging": "0.1.186"
+  },
+  "frameworks": {
+    ".NETFramework,Version=v4.0": {
+      "imports": [
+        "dotnet",
+        "netstandard1.0",
+        "netstandard1.1",
+        "netstandard1.2",
+        "netstandard1.3",
+        "netstandard1.4",
+        "netstandard1.5",
+        "netstandard1.6",
+        "net20",
+        "net35",
+        "net40",
+        "native",
+        "monoandroid",
+        "xamarinios10"
+      ]
+    }
+  }
+}

build/WinObjC.Frameworks.UWP/project.json

@@ -0,0 +1,25 @@
+{
+  "dependencies": {
+    "NuGet.Build.Packaging": "0.1.186"
+  },
+  "frameworks": {
+    ".NETFramework,Version=v4.0": {
+      "imports": [
+        "dotnet",
+        "netstandard1.0",
+        "netstandard1.1",
+        "netstandard1.2",
+        "netstandard1.3",
+        "netstandard1.4",
+        "netstandard1.5",
+        "netstandard1.6",
+        "net20",
+        "net35",
+        "net40",
+        "native",
+        "monoandroid",
+        "xamarinios10"
+      ]
+    }
+  }
+}

build/WinObjC.Frameworks/project.json

@@ -0,0 +1,25 @@
+{
+  "dependencies": {
+    "NuGet.Build.Packaging": "0.1.186"
+  },
+  "frameworks": {
+    ".NETFramework,Version=v4.0": {
+      "imports": [
+        "dotnet",
+        "netstandard1.0",
+        "netstandard1.1",
+        "netstandard1.2",
+        "netstandard1.3",
+        "netstandard1.4",
+        "netstandard1.5",
+        "netstandard1.6",
+        "net20",
+        "net35",
+        "net40",
+        "native",
+        "monoandroid",
+        "xamarinios10"
+      ]
+    }
+  }
+}