Merge branch 'main' into main

Author: JoeRobich

.config/dotnet-tools.json

@@ -0,0 +1,10 @@
+{
+    "instanceUrl": "https://devdiv.visualstudio.com/",
+    "template": "TFSDEVDIV",
+    "projectName": "DEVDIV",
+    "areaPath": "DevDiv\\NET Tools\\SDK",
+    "iterationPath": "DevDiv",
+    "notificationAliases": [ "[email protected]" ],
+    "repositoryName": "dotnet-sdk",
+    "codebaseName": "dotnet-sdk"
+}

.config/tsaoptions.json

@@ -11,6 +11,11 @@
       ]
     }
   },
+  "features": {
+    "ghcr.io/devcontainers/features/sshd:1": {
+        "version": "latest"
+    }
+  },
   // Use 'postCreateCommand' to run commands after the container is created.
   "postCreateCommand": "bash -i ${containerWorkspaceFolder}/.devcontainer/scripts/post-creation.sh",
   // Add the locally installed dotnet to the path to ensure that it is activated
@@ -22,5 +27,10 @@
     "DOTNET_ROOT": "${containerWorkspaceFolder}/.dotnet",
     "DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR": "${containerWorkspaceFolder}/.dotnet",
     "NUGET_PACKAGES": "/home/vscode/.nuget/packages"
+  },
+  "remoteUser": "vscode",
+  "hostRequirements": {
+    "cpus": 16,
+    "memory": "32gb"
   }
 }

.devcontainer/devcontainer.json

@@ -1,4 +1,12 @@
+#! /usr/bin/env sh
+
 # Install SDK and tool dependencies before container starts
 # Also run the full restore on the repo so that go-to definition
 # and other language features will be available in C# files
 ./restore.sh
+# run the build so that everything is 'hot'
+./build.sh -tl:off
+# setup the IDE env to point to the local .dotnet folder so that assemblies/tools are loaded as expected
+# this script is run from repo root so shellcheck warning about relative-path lookups can be ignored
+# shellcheck disable=SC1091
+. ./artifacts/sdk-build-env.sh

.devcontainer/scripts/post-creation.sh

@@ -280,6 +280,10 @@ dotnet_diagnostic.IDE0200.severity = none
 dotnet_diagnostic.IDE0240.severity = warning
 
 # Additional rules for template engine source code
+
+# Default severity for analyzer diagnostics with category 'StyleCop.CSharp.SpacingRules'
+dotnet_analyzer_diagnostic.category-StyleCop.CSharp.SpacingRules.severity = none
+
 [{src,test}/**{Microsoft.TemplateEngine.*,dotnet-new?*}/**.cs]
 # Default analyzed API surface = 'public' (public APIs)
 dotnet_code_quality.api_surface = public
@@ -456,7 +460,7 @@ dotnet_diagnostic.SA1601.severity = none
 dotnet_diagnostic.SA1633.severity = none
 
 # Additional rules for test source code for template engine
-[test/{Microsoft.TemplateEngine.*,dotnet-new.Tests}/**.cs]
+[test/{Microsoft.TemplateEngine.*,dotnet-new.IntegrationTests}/**.cs]
 # Test methods should not be skipped
 dotnet_diagnostic.xUnit1004.severity = warning
 # Elements should appear in the correct order
@@ -475,6 +479,10 @@ indent_brace_style = Allman
 [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
 indent_size = 2
 
+# WiX files
+[*.{wixproj,wxs,wxi,wxl,thm}]
+indent_size = 2
+
 [*.{csproj,vbproj,proj,nativeproj,locproj}]
 charset = utf-8-bom
 
@@ -506,5 +514,12 @@ dotnet_diagnostic.IDE0040.severity = warning
 [*.txt]
 insert_final_newline = false
 
-[test/dotnet-new.Tests/**/Approvals/**]
-trim_trailing_whitespace = false
+# Verify settings
+[*.{received,verified}.{txt,xml,json}]
+charset = "utf-8-bom"
+end_of_line = lf
+indent_size = unset
+indent_style = unset
+insert_final_newline = false
+tab_width = unset
+trim_trailing_whitespace = false

.devcontainer/vmr/README.md

@@ -10,6 +10,12 @@
 ###############################################################################
 *.xlf linguist-generated=true
 
+###############################################################################
+# Set default behavior to:
+#   don't collapse these files in PRs
+###############################################################################
+**/build/** linguist-generated=false
+
 ###############################################################################
 # Set file behavior to:
 #   treat as text
@@ -55,4 +61,9 @@
 
 *.jpg  	binary
 *.png 	binary
-*.gif 	binary
+*.gif 	binary
+
+# VerifyTests
+*.verified.txt text eol=lf working-tree-encoding=UTF-8
+*.verified.xml text eol=lf working-tree-encoding=UTF-8
+*.verified.json text eol=lf working-tree-encoding=UTF-8