Merge pull request #979 from App-vNext/undo-syntax-changes

Merge v724-or-v730 to default branch

Author: martincostello

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "2.0.0",
+      "commands": [
+        "dotnet-cake"
+      ]
+    }
+  }
+}

.git-blame-ignore-revs

@@ -0,0 +1,4 @@
+# Use file-scoped namespaces
+a450cb69b5e4549f5515cdb057a68771f56cefd7
+e32730600746b479db0241826b9bdef8eec9bb28
+63b151ebc191ef35df9e3f29584ca94ec5d7c792

.github/workflows/build.yml

@@ -0,0 +1,51 @@
+name: build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ windows-latest ]
+        include:
+          #- os: macos-latest
+          #  os_name: macos
+          #- os: ubuntu-latest
+          #  os_name: linux
+          - os: windows-latest
+            os_name: windows
+
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3
+
+    - name: Build, Test and Package
+      shell: pwsh
+      run: ./build.ps1
+      env:
+        DOTNET_CLI_TELEMETRY_OPTOUT: true
+        DOTNET_GENERATE_ASPNET_CERTIFICATE: false
+        DOTNET_NOLOGO: true
+        DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+        DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: 1
+        NUGET_XMLDOC_MODE: skip
+        TERM: xterm
+
+    - name: Publish NuGet packages
+      uses: actions/upload-artifact@v3
+      with:
+        name: packages-${{ matrix.os_name }}
+        path: ./artifacts/nuget-package

.gitignore

@@ -13,7 +13,6 @@ TestResults
 *.user
 *.sln.docstates
 .vs/
-.vscode/
 .idea/
 .ionide/
 
@@ -123,4 +122,5 @@ tools
 
 *.lock.json
 *.nuget.targets
-*.nuget.props
+*.nuget.props
+coverage.*.json

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "EditorConfig.EditorConfig",
+    "k--kato.docomment",
+    "ms-dotnettools.csharp"
+  ]
+}

.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Run tests",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build",
+      "program": "dotnet",
+      "args": [
+        "test"
+      ],
+      "cwd": "${workspaceFolder}/src/Polly.Specs",
+      "console": "internalConsole",
+      "stopAtEntry": false,
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,15 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "build",
+      "command": "dotnet build ./src/Polly.sln",
+      "type": "shell",
+      "group": "build",
+      "presentation": {
+        "reveal": "silent"
+      },
+      "problemMatcher": "$msCompile"
+    }
+  ]
+}

GitVersionConfig.yaml

@@ -1 +1 @@
-next-version: 7.3.0
+next-version: 7.2.4

appveyor.yml

@@ -12,5 +12,7 @@ artifacts:
   - path: artifacts\nuget-package\*.snupkg
 
 environment:
-  # Skip dotnet package caching on build servers
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
+  DOTNET_GENERATE_ASPNET_CERTIFICATE: false
+  DOTNET_NOLOGO: true
+  NUGET_XMLDOC_MODE: skip

build.bat

@@ -3,4 +3,3 @@ PUSHD %~dp0
 PowerShell.exe -NoProfile -ExecutionPolicy Bypass -Command "& './build.ps1'"
 
 IF %errorlevel% neq 0 PAUSE
-