diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 94cd90a..70e72bd 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -5,11 +5,13 @@ trigger: batch: true branches: include: - - master - - develop + - main paths: exclude: - README.md + tags: + include: + - "*" pr: none diff --git a/.vsts-compliance.yml b/.vsts-compliance.yml index 25ae08b..1ac8cf6 100644 --- a/.vsts-compliance.yml +++ b/.vsts-compliance.yml @@ -5,8 +5,7 @@ trigger: batch: true branches: include: - - master - - develop + - main paths: exclude: - README.md @@ -35,11 +34,11 @@ steps: sourceScanPath: $(Build.SourcesDirectory) - task: securedevelopmentteam.vss-secure-development-tools.build-task-prefast.SDLNativeRules@2 - displayName: 'Run the PREfast SDL Native Rules for MSBuild' + displayName: Run the PREfast SDL Native Rules for MSBuild continueOnError: true - task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@1 - displayName: 'Run PoliCheck' + displayName: Run PoliCheck inputs: targetType: F targetArgument: '$(Build.SourcesDirectory)' @@ -49,7 +48,7 @@ steps: continueOnError: true - task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@3 - displayName: 'Run BinSkim' + displayName: Run BinSkim inputs: InputType: Basic Function: analyze @@ -60,13 +59,13 @@ steps: continueOnError: true - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2 - displayName: 'Run CredScan' + displayName: Run CredScan inputs: debugMode: false # Publish compliance results - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2 - displayName: 'Publish Security Analysis Logs' + displayName: Publish Security Analysis Logs - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@1 displayName: Check SDL results diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3689c6f..c47a506 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ This project uses the following software. Newer versions may work but backward c ## Coding -This project uses a Git flow model releasing from the `master` branch with development based on and stabilize in the `develop` branch. You can view current build status in the [README](README.md) document. +This project uses a GitHub flow model with development and releases based on the `main` branch. You can view current build status in the [README](README.md) document. Please follow project code styles including, diff --git a/README.md b/README.md index ed327ef..da5b462 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ Visual Studio Locator ===================== -![build status: master](https://devdiv.visualstudio.com/DevDiv/_apis/build/status/Setup/Setup-vswhere-CI?branchName=master&label=master) -![build status: develop](https://devdiv.visualstudio.com/DevDiv/_apis/build/status/Setup/Setup-vswhere-CI?branchName=develop&label=develop) +![build status: main](https://devdiv.visualstudio.com/DevDiv/_apis/build/status/Setup/Setup-vswhere-CI?branchName=main&label=main) [![github release](https://img.shields.io/github/release/Microsoft/vswhere.svg?logo=github&logoColor=white)](https://github.com/Microsoft/vswhere/releases/latest) [![github releases: all](https://img.shields.io/github/downloads/Microsoft/vswhere/total.svg?logo=github&logoColor=white&label=github)](https://github.com/Microsoft/vswhere/releases) [![nuget: all](https://img.shields.io/nuget/dt/vswhere.svg?logo=nuget&logoColor=white&label=nuget)](https://nuget.org/packages/vswhere) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f1b4912..74866b0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,8 +6,7 @@ trigger: none pr: branches: include: - - master - - develop + - main paths: exclude: - README.md diff --git a/src/vswhere.lib/stdafx.h b/src/vswhere.lib/stdafx.h index dc059b8..aef611d 100644 --- a/src/vswhere.lib/stdafx.h +++ b/src/vswhere.lib/stdafx.h @@ -9,10 +9,6 @@ #define WIN32_LEAN_AND_MEAN -#ifndef MAXUINT -#define MAXUINT 0xffff -#endif - // Windows headers #include #include diff --git a/src/vswhere.lib/vswhere.lib.rc b/src/vswhere.lib/vswhere.lib.rc index 9f81979..0a4135e 100644 Binary files a/src/vswhere.lib/vswhere.lib.rc and b/src/vswhere.lib/vswhere.lib.rc differ diff --git a/src/vswhere.lib/vswhere.lib.vcxproj b/src/vswhere.lib/vswhere.lib.vcxproj index fc04826..4f92fdd 100644 --- a/src/vswhere.lib/vswhere.lib.vcxproj +++ b/src/vswhere.lib/vswhere.lib.vcxproj @@ -15,8 +15,8 @@ {4CCF39CB-4794-44E2-AA57-D215F13CF606} Win32Proj vswherelib - 10.0.17763.0 - 10.0.17763.0 + 10.0.19041.0 + 10.0.19041.0 diff --git a/src/vswhere/Program.cpp b/src/vswhere/Program.cpp index 6ee590d..1e997a1 100644 --- a/src/vswhere/Program.cpp +++ b/src/vswhere/Program.cpp @@ -99,6 +99,9 @@ int wmain(_In_ int argc, _In_ LPCWSTR argv[]) } catch (const system_error& ex) { + // Make sure the console is initialized even for parsing errors. + console.Initialize(); + const auto code = ex.code().value(); if (ERROR_INVALID_PARAMETER == code) { diff --git a/src/vswhere/vswhere.vcxproj b/src/vswhere/vswhere.vcxproj index 29780f4..7132394 100644 --- a/src/vswhere/vswhere.vcxproj +++ b/src/vswhere/vswhere.vcxproj @@ -16,8 +16,8 @@ {210864F0-9A29-4479-B830-B802EE3F4D92} Win32Proj vswhere - 10.0.17763.0 - 10.0.17763.0 + 10.0.19041.0 + 10.0.19041.0 diff --git a/test/vswhere.test/vswhere.test.vcxproj b/test/vswhere.test/vswhere.test.vcxproj index f0c498d..bd9d04a 100644 --- a/test/vswhere.test/vswhere.test.vcxproj +++ b/test/vswhere.test/vswhere.test.vcxproj @@ -16,8 +16,8 @@ {76268871-D5A5-46BD-9805-41DB1C3072D1} Win32Proj vswheretest - 10.0.17763.0 - 10.0.17763.0 + 10.0.19041.0 + 10.0.19041.0 NativeUnitTestProject