Updated from MS main

Author: David-FromVS

.gitattributes

@@ -7,3 +7,6 @@
 # Treat pkgdef files as text
 ###############################################################################
 *.pkgdef text
+
+# Use unix line endings on shell scripts so that they can be run on unix
+*.sh.txt text eol=lf

.gitignore

@@ -20,11 +20,14 @@ intermediate
 *.tmp
 *.VC.opendb
 *.VC.db
+*.binlog
 packages/
 .vs/
 Microsoft.VisualStudio.Glass
 /Iris/Programs/*.dll
 /Iris/Programs/*.exe
 /Iris/Programs/*.pdb
+/Iris/ic/Properties/launchSettings.json
+/Iris/xplat-package/Properties/launchSettings.json
 /CppCustomVisualizer/SignVSIX.bat
 /CppCustomVisualizer/dll/CppCustomVisualizer.aps

BuildAndTest.proj

@@ -74,7 +74,7 @@
 
   <ItemGroup>
     <Solution Include="$(IrisDir)Iris.sln;$(HelloWorldDir)cs\HelloWorld.sln">
-      <AdditionalProperties>Configuration=$(Configuration)</AdditionalProperties>
+      <AdditionalProperties>Configuration=$(Configuration);Platform=Any CPU</AdditionalProperties>
     </Solution>
     <Solution Include="$(HelloWorldDir)cpp\HelloWorld.sln">
       <AdditionalProperties>Configuration=$(Configuration);Platform=Win32</AdditionalProperties>

Iris/FrontEndTest/FrontEndTest.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net5.0;net472</TargetFrameworks>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\IrisCompiler\IrisCompiler.csproj" />
+    <ProjectReference Include="..\IrisRuntime\IrisRuntime.csproj" />
+  </ItemGroup>
+
+</Project>