[WIP] Cherry pick two commits into release/1.7 branch

.aspire/settings.json

@@ -0,0 +1,3 @@
+{
+  "appHostPath": "../src/Aspire.AppHost/Aspire.AppHost.csproj"
+}

.gitattributes

@@ -15,3 +15,6 @@
 *.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
+
+# This can't be enabled as there are tests that rely on the CRLF endings in files'
+#*.cs text eol=lf

.pipelines/azure-pipelines.yml

@@ -9,6 +9,18 @@ trigger:
     - gh-readonly-queue/main
     - release/*
 
+pr:
+  branches:
+    include:
+    - main
+    - release/*
+  paths:
+    exclude:
+    - samples/**
+    - docs/**
+    - '*.md'
+    - templates/**
+
 variables:
 #  DebugArguments: ' --filter "TestCategory!=ABC" --verbosity normal '
 #  ReleaseArguments: ' --filter "TestCategory!=ABC" --verbosity normal '

.pipelines/cosmos-pipelines.yml

@@ -13,6 +13,18 @@ trigger:
     - gh-readonly-queue/main
     - release/*
 
+pr:
+  branches:
+    include:
+    - main
+    - release/*
+  paths:
+    exclude:
+    - samples/**
+    - docs/**
+    - '*.md'
+    - templates/**
+
 strategy:
   matrix:
     windows:

.pipelines/dwsql-pipelines.yml

@@ -16,6 +16,18 @@ trigger:
     exclude:
     - docs
 
+pr:
+  branches:
+    include:
+    - main
+    - release/*
+  paths:
+    exclude:
+    - samples/**
+    - docs/**
+    - '*.md'
+    - templates/**
+
 jobs:
 - job: linux
   pool:

.pipelines/mssql-pipelines.yml

@@ -16,6 +16,18 @@ trigger:
     exclude:
     - docs
 
+pr:
+  branches:
+    include:
+    - main
+    - release/*
+  paths:
+    exclude:
+    - samples/**
+    - docs/**
+    - '*.md'
+    - templates/**
+
 jobs:
 - job: linux
   condition: false # Disable until we resolve flakey pipeline issue. https://github.com/Azure/data-api-builder/issues/2010
@@ -110,7 +122,7 @@ jobs:
     displayName: 'Run MsSql Integration Tests'
     inputs:
       command: test
-      arguments: '--filter "TestCategory=MsSql" --no-build --configuration $(buildConfiguration) --collect "XPlat Code coverage"'
+      arguments: '--filter "TestCategory=MsSql&FullyQualifiedName!~ConfigurationHotReloadTests" --no-build --configuration $(buildConfiguration) --collect "XPlat Code coverage"'
       projects: '**/*Tests/*.csproj'
 
   - task: CmdLine@2
@@ -234,11 +246,20 @@ jobs:
       targetFiles: 'src/out/tests/*/dab-config.MsSql.json'
 
   - task: DotNetCoreCLI@2
-    displayName: 'Run MsSql Integration Tests'
+    displayName: 'MsSql Integration Tests'
+    inputs:
+      command: test
+      arguments: '--filter "TestCategory=MsSql&FullyQualifiedName!~ConfigurationHotReloadTests" --no-build --configuration $(buildConfiguration) --collect "XPlat Code coverage"'
+      projects: '**/*Tests/*.csproj'
+
+
+  - task: DotNetCoreCLI@2
+    displayName: 'Hot-Reload Tests'
     inputs:
       command: test
-      arguments: '--filter "TestCategory=MsSql" --no-build --configuration $(buildConfiguration) --collect "XPlat Code coverage"'
+      arguments: '--filter "TestCategory=MsSql&FullyQualifiedName~ConfigurationHotReloadTests" --no-build --configuration $(buildConfiguration) --collect "XPlat Code coverage" --logger "console;verbosity=detailed"'
       projects: '**/*Tests/*.csproj'
+    timeoutInMinutes: 45
 
   - task: PublishCodeCoverageResults@1
     displayName: 'Publish code coverage'

.pipelines/mysql-pipelines.yml

@@ -14,6 +14,18 @@ trigger:
     - gh-readonly-queue/main
     - release/*
 
+pr:
+  branches:
+    include:
+    - main
+    - release/*
+  paths:
+    exclude:
+    - samples/**
+    - docs/**
+    - '*.md'
+    - templates/**
+
 jobs:
 - job: linux
   pool:

.pipelines/pg-pipelines.yml

@@ -9,6 +9,18 @@ trigger:
     - gh-readonly-queue/main
     - release/*
 
+pr:
+  branches:
+    include:
+    - main
+    - release/*
+  paths:
+    exclude:
+    - samples/**
+    - docs/**
+    - '*.md'
+    - templates/**
+
 jobs:
 - job: linux
   pool:

.pipelines/unittest-pipelines.yml

@@ -1,6 +1,26 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+trigger:
+  batch: true
+  branches:
+    include:
+    - main
+    - gh-readonly-queue/main
+    - release/*
+
+pr:
+  branches:
+    include:
+    - main
+    - release/*
+  paths:
+    exclude:
+    - samples/**
+    - docs/**
+    - '*.md'
+    - templates/**
+
 pool:
   vmImage: 'ubuntu-latest' # examples of other options: 'macOS-10.15', 'windows-2019'
 

CONTRIBUTING.md

@@ -95,7 +95,7 @@ We use `dotnet format` to enforce code conventions. It is run automatically in C
 
 #### Enforcing code style with git hooks
 
-You can copy paste the following commands to install a git pre-commit hook. This will cause a commit to fail if you forgot to run `dotnet format`. If you have run on save enabled in your editor this is not necessary.
+You can copy paste the following commands to install a git pre-commit hook (creates a pre-commit file in your .git folder, which isn't shown in vs code).  This will cause a commit to fail if you forgot to run `dotnet format`. If you have run on save enabled in your editor this is not necessary.
 
 ```bash
 cat > .git/hooks/pre-commit << __EOF__
@@ -112,17 +112,42 @@ if [ "\$(get_files)" = '' ]; then
 fi
 
 get_files |
-    xargs dotnet format src/Azure.DataApiBuilder.Service.sln \\
-        --check \\
-        --fix-whitespace --fix-style warn --fix-analyzers warn \\
+    xargs dotnet format src/Azure.DataApiBuilder.sln \\
+        --verify-no-changes
         --include \\
     || {
         get_files |
-            xargs dotnet format src/Azure.DataApiBuilder.Service.sln \\
-                --fix-whitespace --fix-style warn --fix-analyzers warn \\
+            xargs dotnet format src/Azure.DataApiBuilder.sln \\
                 --include
         exit 1
 }
 __EOF__
 chmod +x .git/hooks/pre-commit
 ```
+
+The file should look like this
+
+``` bash
+#!/bin/bash
+set -euo pipefail
+
+get_files() {
+    git diff --cached --name-only --diff-filter=ACMR |  \
+        grep '\.cs$'
+}
+
+if [ "$(get_files)" = '' ]; then
+    exit 0
+fi
+
+get_files |
+    xargs dotnet format src/Azure.DataApiBuilder.sln \
+        --verify-no-changes \
+        --include \
+    || {
+        get_files |
+            xargs dotnet format src/Azure.DataApiBuilder.sln \
+                --include
+        exit 1
+}
+```