Adjust raw template for use in current repository

Author: sharwell

.editorconfig

@@ -9,6 +9,8 @@ indent_style = space
 
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
+file_header_template = Copyright (c) Microsoft. All rights reserved.\nLicensed under the MIT License. See LICENSE in the project root for more information.
+
 [*.yml]
 indent_size = 2
 indent_style = space
@@ -36,10 +38,10 @@ indent_style = space
 [*.{cs,vb}]
 # Sort using and Import directives with System.* appearing first
 dotnet_sort_system_directives_first = true
-dotnet_style_qualification_for_field = true:warning
-dotnet_style_qualification_for_property = true:warning
-dotnet_style_qualification_for_method = true:warning
-dotnet_style_qualification_for_event = true:warning
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning
 
 # Use language keywords instead of framework type names for type references
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
@@ -73,15 +75,15 @@ dotnet_naming_symbols.constants.required_modifiers = const
 
 dotnet_naming_style.constant_style.capitalization = pascal_case
 
-# Static fields are camelCase
+# Static readonly fields are PamelCase
 dotnet_naming_rule.static_fields_should_be_camel_case.severity = suggestion
 dotnet_naming_rule.static_fields_should_be_camel_case.symbols = static_fields
-dotnet_naming_rule.static_fields_should_be_camel_case.style = static_field_style
+dotnet_naming_rule.static_fields_should_be_camel_case.style = static_readonly_field_style
 
 dotnet_naming_symbols.static_fields.applicable_kinds = field
-dotnet_naming_symbols.static_fields.required_modifiers = static
+dotnet_naming_symbols.static_fields.required_modifiers = static, readonly
 
-dotnet_naming_style.static_field_style.capitalization = camel_case
+dotnet_naming_style.static_readonly_field_style.capitalization = pascal_case
 
 # Instance fields are camelCase
 dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion
@@ -91,6 +93,7 @@ dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_s
 dotnet_naming_symbols.instance_fields.applicable_kinds = field
 
 dotnet_naming_style.instance_field_style.capitalization = camel_case
+dotnet_naming_style.instance_field_style.required_prefix = _
 
 # Locals and parameters are camelCase
 dotnet_naming_rule.locals_should_be_camel_case.severity = suggestion
@@ -125,13 +128,13 @@ dotnet_naming_style.pascal_case_style.capitalization = pascal_case
 csharp_indent_block_contents = true
 csharp_indent_braces = false
 csharp_indent_case_contents = true
-csharp_indent_switch_labels = true
+csharp_indent_switch_labels = false
 csharp_indent_labels = flush_left
 
 # Prefer "var" everywhere
-csharp_style_var_for_built_in_types = false
+csharp_style_var_for_built_in_types = true:suggestion
 csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = false:warning
+csharp_style_var_elsewhere = true:suggestion
 
 # Prefer method-like constructs to have a block body
 csharp_style_expression_bodied_methods = false:none

.github/workflows/Windows.runsettings

@@ -4,7 +4,7 @@
       <DataCollector friendlyName="blame" enabled="True">
         <Configuration>
           <CollectDump DumpType="full" />
-          <CollectDumpOnTestSessionHang TestTimeout="30000" DumpType="full" />
+          <CollectDumpOnTestSessionHang TestTimeout="1200000" DumpType="full" />
         </Configuration>
       </DataCollector>
     </DataCollectors>

.github/workflows/build.yml

@@ -12,7 +12,7 @@ env:
   TreatWarningsAsErrors: true
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   BUILDCONFIGURATION: Release
-  codecov_token: 4dc9e7e2-6b01-4932-a180-847b52b43d35 # Get a new one from https://codecov.io/
+  codecov_token: c8862aaf-0c6d-48ee-a4a7-e88af58ef469
   NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
 
 jobs:
@@ -23,8 +23,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - ubuntu-20.04
-        - macos-latest
         - windows-latest
 
     steps:
@@ -39,12 +37,19 @@ jobs:
     - name: Set pipeline variables based on source
       run: azure-pipelines/variables/_pipelines.ps1
       shell: pwsh
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1.0.2
+    - name: Prepare Visual Studio
+      run: '&"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe" /RootSuffix Exp /ResetSettings General.vssettings /Command File.Exit'
     - name: build
-      run: dotnet build --no-restore -c ${{ env.BUILDCONFIGURATION }} /v:m /bl:"bin/build_logs/build.binlog"
+      run: msbuild /t:Build /p:Configuration=${{ env.BUILDCONFIGURATION }} /v:m /bl:"bin/build_logs/build.binlog"
     - name: pack
-      run: dotnet pack --no-build -c ${{ env.BUILDCONFIGURATION }} /v:m /bl:"bin/build_logs/pack.binlog"
+      run: msbuild /t:Pack /p:Configuration=${{ env.BUILDCONFIGURATION }} /v:m /bl:"bin/build_logs/pack.binlog"
     - name: test
-      run: dotnet test --no-build -c ${{ env.BUILDCONFIGURATION }} /bl:"bin/build_logs/test.binlog" --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --logger trx --settings "${{ github.workspace }}/.github/workflows/${{ runner.os }}.runsettings"
+      run: dotnet test --no-build -c ${{ env.BUILDCONFIGURATION }} /bl:"bin/build_logs/test.binlog" --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true /m:1 --logger trx --settings "${{ github.workspace }}/.github/workflows/${{ runner.os }}.runsettings"
+    - name: Test EqualExceptionLegacy
+      run: test/EqualExceptionLegacy/Test.ps1 -binlog bin/build_logs/EqualExceptionLegacy.binlog
+      shell: pwsh
     - name: Update pipeline variables based on build outputs
       run: azure-pipelines/variables/_pipelines.ps1
       shell: pwsh
@@ -79,6 +84,13 @@ jobs:
         name: testResults-${{ runner.os }}
         path: obj/_artifacts/testResults
       continue-on-error: true
+    - name: Upload rawTestResults
+      if: always()
+      uses: actions/upload-artifact@v1
+      with:
+        name: rawTestResults-${{ runner.os }}
+        path: obj/_artifacts/rawTestResults
+      continue-on-error: true
     - name: Upload coverageResults
       if: always()
       uses: actions/upload-artifact@v1

Directory.Build.props

@@ -6,16 +6,14 @@
     <BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(RepoRootPath)bin\$(MSBuildProjectName)\</BaseOutputPath>
     <PackageOutputPath>$(RepoRootPath)bin\Packages\$(Configuration)\NuGet\</PackageOutputPath>
     <LangVersion>10.0</LangVersion>
+    <Features>strict</Features>
     <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>disable</ImplicitUsings>
     <AnalysisLevel>latest</AnalysisLevel>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
 
-    <!-- This entire repo has just one version.json file, so compute the version once and share with all projects in a large build. -->
-    <GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
-
     <!-- Local builds should embed PDBs so we never lose them when a subsequent build occurs. -->
     <DebugType Condition=" '$(CI)' != 'true' and '$(TF_BUILD)' != 'true' ">embedded</DebugType>
 
@@ -33,6 +31,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.0.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
     <!-- <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All" /> -->
@@ -56,8 +55,7 @@
 
   <Target Name="PrepareReleaseNotes" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
     <PropertyGroup>
-      <!-- TEMPLATE USER: replace the ORG/REPO (or entire link) below and uncomment. -->
-      <!-- <PackageReleaseNotes>https://github.com/ORG/REPO/releases/tag/v$(Version)</PackageReleaseNotes> -->
+       <PackageReleaseNotes>https://github.com/microsoft/vs-extension-testing/releases/tag/v$(Version)</PackageReleaseNotes> 
     </PropertyGroup>
   </Target>
 

NuGet.config

@@ -11,6 +11,10 @@
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
   </packageSources>
+  <disabledPackageSources>
+    <!-- Defend against user or machine level disabling of sources that we list in this file. -->
+    <clear />
+  </disabledPackageSources>
   <trustedSigners>
     <repository name="nuget" serviceIndex="https://api.nuget.org/v3/index.json">
       <owners>Microsoft;xunit;manuel.roemer;sharwell;jamesnk;aarnott;MarcoRossignoli;Thecentury</owners>

azure-pipelines.yml

@@ -3,7 +3,6 @@ trigger:
   branches:
     include:
     - main
-    - microbuild
     - 'validate/*'
   paths:
     exclude:
@@ -12,20 +11,12 @@ trigger:
     - .vscode/
     - .github/
 
-parameters:
-- name: includeMacOS
-  displayName: Build on macOS
-  type: boolean
-  default: false # macOS is often bogged down in Azure Pipelines
-
 variables:
   TreatWarningsAsErrors: true
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   BuildConfiguration: Release
-  # codecov_token: 4dc9e7e2-6b01-4932-a180-847b52b43d35 # Get a new one from https://codecov.io/
+  codecov_token: c8862aaf-0c6d-48ee-a4a7-e88af58ef469
   NUGET_PACKAGES: $(Agent.TempDirectory)/.nuget/packages
 
 jobs:
 - template: azure-pipelines/build.yml
-  parameters:
-    includeMacOS: ${{ parameters.includeMacOS }}

azure-pipelines/Windows_NT.runsettings

@@ -4,7 +4,7 @@
       <DataCollector friendlyName="blame" enabled="True">
         <Configuration>
           <CollectDump DumpType="full" />
-          <CollectDumpOnTestSessionHang TestTimeout="30000" DumpType="full" />
+          <CollectDumpOnTestSessionHang TestTimeout="600000" DumpType="full" />
         </Configuration>
       </DataCollector>
     </DataCollectors>

azure-pipelines/artifacts/rawTestResults.ps1

@@ -0,0 +1,13 @@
+if ($env:AGENT_TEMPDIRECTORY) {
+    $xunitRoot = "$($env:AGENT_TEMPDIRECTORY)\xUnitResults"
+} elseif ($env:RUNNER_TEMP) {
+    $xunitRoot = "$($env:RUNNER_TEMP)\xUnitResults"
+} else {
+    return
+}
+
+@{
+    "$xunitRoot" = (
+        (Get-ChildItem "$xunitRoot" -Recurse)
+    );
+}

azure-pipelines/artifacts/testResults.ps1

@@ -3,10 +3,10 @@ $result = @{}
 if ($env:AGENT_TEMPDIRECTORY) {
     # The DotNetCoreCLI uses an alternate location to publish these files
     $guidRegex = '^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$'
-    $result[$env:AGENT_TEMPDIRECTORY] = (Get-ChildItem $env:AGENT_TEMPDIRECTORY -Directory |? { $_.Name -match $guidRegex } |% { Get-ChildItem "$($_.FullName)\dotnet*.dmp","$($_.FullName)\testhost*.dmp","$($_.FullName)\Sequence_*.xml" -Recurse });
+    $result[$env:AGENT_TEMPDIRECTORY] = (Get-ChildItem $env:AGENT_TEMPDIRECTORY -Directory |? { $_.Name -match $guidRegex } |% { Get-ChildItem "$($_.FullName)\dotnet*.dmp","$($_.FullName)\testhost*.dmp","$($_.FullName)\devenv*.dmp","$($_.FullName)\Sequence_*.xml" -Recurse });
 }
 else {
-    $testRoot = Resolve-Path "$PSScriptRoot\..\..\test"
+    $testRoot = Resolve-Path "$PSScriptRoot\..\..\src\Microsoft.VisualStudio.Extensibility.Testing.Xunit.Legacy.IntegrationTests"
     $result[$testRoot] = (Get-ChildItem "$testRoot\TestResults" -Recurse -Directory | Get-ChildItem -Recurse -File)
 }
 

azure-pipelines/build.yml

@@ -3,7 +3,6 @@ parameters:
   type: object
   default:
     vmImage: windows-2022
-- name: includeMacOS
 - name: EnableAPIScan
   type: boolean
   default: false
@@ -37,34 +36,9 @@ jobs:
       parameters:
         EnableAPIScan: ${{ parameters.EnableAPIScan }}
 
-  - template: expand-template.yml
-
-- job: Linux
-  pool:
-    vmImage: Ubuntu 20.04
-  steps:
-  - checkout: self
-    clean: true
-  - template: install-dependencies.yml
-  - template: dotnet.yml
-  - template: expand-template.yml
-
-- job: macOS
-  condition: ${{ parameters.includeMacOS }}
-  pool:
-    vmImage: macOS-10.15
-  steps:
-  - checkout: self
-    clean: true
-  - template: install-dependencies.yml
-  - template: dotnet.yml
-  - template: expand-template.yml
-
 - job: WrapUp
   dependsOn:
   - Windows
-  - Linux
-  - macOS
   pool:
     vmImage: Ubuntu 20.04
   condition: succeededOrFailed()
@@ -75,5 +49,3 @@ jobs:
     parameters:
       initArgs: -NoRestore
   - template: publish-codecoverage.yml
-    parameters:
-      includeMacOS: ${{ parameters.includeMacOS }}