From 49ab008b35a153075e7b5f9a032de9c90ef58965 Mon Sep 17 00:00:00 2001 From: Leonard Hecker Date: Fri, 4 Feb 2022 01:51:47 +0100 Subject: [PATCH] wip --- build/pipelines/release.yml | 8 +++++--- .../templates/build-console-audit-job.yml | 6 ++++-- build/pipelines/templates/build-console-ci.yml | 14 ++++++++------ build/pipelines/templates/build-console-pgo.yml | 8 +++++--- src/host/proxy/Host.Proxy.vcxproj | 11 +++++++++++ src/host/proxy/nodefaultlib_shim.h | 16 +++------------- 6 files changed, 36 insertions(+), 27 deletions(-) diff --git a/build/pipelines/release.yml b/build/pipelines/release.yml index 1b96838cc1..039d550235 100644 --- a/build/pipelines/release.yml +++ b/build/pipelines/release.yml @@ -2,9 +2,11 @@ trigger: none pr: none -pool: +pool: name: WinDevPool-L - demands: ImageOverride -equals WinDevVS16-latest + demands: + - ImageOverride -equals WinDevVS16-latest + - ImageVersionOverride -equals 6.0.0 parameters: - name: branding @@ -271,7 +273,7 @@ jobs: - ${{ if eq(parameters.runCompliance, true) }}: - template: ./templates/build-console-compliance-job.yml - + - ${{ if eq(parameters.buildTerminal, true) }}: - job: BundleAndSign displayName: Create and sign AppX/MSIX bundles diff --git a/build/pipelines/templates/build-console-audit-job.yml b/build/pipelines/templates/build-console-audit-job.yml index 51fac9a57d..a9dba16881 100644 --- a/build/pipelines/templates/build-console-audit-job.yml +++ b/build/pipelines/templates/build-console-audit-job.yml @@ -8,12 +8,14 @@ jobs: variables: BuildConfiguration: AuditMode BuildPlatform: ${{ parameters.platform }} - pool: + pool: ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: name: WinDevPoolOSS-L ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: name: WinDevPool-L - demands: ImageOverride -equals WinDevVS16-latest + demands: + - ImageOverride -equals WinDevVS16-latest + - ImageVersionOverride -equals 6.0.0 steps: - checkout: self diff --git a/build/pipelines/templates/build-console-ci.yml b/build/pipelines/templates/build-console-ci.yml index 0ff8b6b540..cec65ee442 100644 --- a/build/pipelines/templates/build-console-ci.yml +++ b/build/pipelines/templates/build-console-ci.yml @@ -11,12 +11,14 @@ jobs: variables: BuildConfiguration: ${{ parameters.configuration }} BuildPlatform: ${{ parameters.platform }} - pool: + pool: ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: name: WinDevPoolOSS-L ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: name: WinDevPool-L - demands: ImageOverride -equals WinDevVS16-latest + demands: + - ImageOverride -equals WinDevVS16-latest + - ImageVersionOverride -equals 6.0.0 steps: - template: build-console-steps.yml @@ -33,16 +35,16 @@ jobs: parameters: name: 'RunTestsInHelix' dependsOn: Build${{ parameters.platform }}${{ parameters.configuration }} - condition: and(succeeded(), and(eq('${{ parameters.platform }}', 'x64'), not(eq(variables['Build.Reason'], 'PullRequest')))) + condition: and(succeeded(), and(eq('${{ parameters.platform }}', 'x64'), not(eq(variables['Build.Reason'], 'PullRequest')))) testSuite: 'DevTestSuite' platform: ${{ parameters.platform }} configuration: ${{ parameters.configuration }} rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }} - + - template: helix-processtestresults-job.yml parameters: dependsOn: - RunTestsInHelix - condition: and(succeededOrFailed(), and(eq('${{ parameters.platform }}', 'x64'), not(eq(variables['Build.Reason'], 'PullRequest')))) + condition: and(succeededOrFailed(), and(eq('${{ parameters.platform }}', 'x64'), not(eq(variables['Build.Reason'], 'PullRequest')))) rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }} - minimumExpectedTestsExecutedCount: ${{ parameters.minimumExpectedTestsExecutedCount }} \ No newline at end of file + minimumExpectedTestsExecutedCount: ${{ parameters.minimumExpectedTestsExecutedCount }} diff --git a/build/pipelines/templates/build-console-pgo.yml b/build/pipelines/templates/build-console-pgo.yml index 044ea0a513..109a4ad390 100644 --- a/build/pipelines/templates/build-console-pgo.yml +++ b/build/pipelines/templates/build-console-pgo.yml @@ -12,12 +12,14 @@ jobs: BuildConfiguration: ${{ parameters.configuration }} BuildPlatform: ${{ parameters.platform }} PGOBuildMode: 'Instrument' - pool: + pool: ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: name: WinDevPoolOSS-L ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: name: WinDevPool-L - demands: ImageOverride -equals WinDevVS16-latest + demands: + - ImageOverride -equals WinDevVS16-latest + - ImageVersionOverride -equals 6.0.0 steps: - template: build-console-steps.yml @@ -34,7 +36,7 @@ jobs: configuration: ${{ parameters.configuration }} platform: ${{ parameters.platform }} rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }} - + - template: helix-processtestresults-job.yml parameters: name: 'ProcessTestResults' diff --git a/src/host/proxy/Host.Proxy.vcxproj b/src/host/proxy/Host.Proxy.vcxproj index 5888ce0c3c..c6129bf828 100644 --- a/src/host/proxy/Host.Proxy.vcxproj +++ b/src/host/proxy/Host.Proxy.vcxproj @@ -7,6 +7,16 @@ OpenConsoleProxy OpenConsoleProxy DynamicLibrary + + StaticLibrary @@ -62,6 +72,7 @@ REGISTER_PROXY_DLL;WIN32;%(PreprocessorDefinitions) NotUsing + Default false false nodefaultlib_shim.h;%(ForcedIncludeFiles) diff --git a/src/host/proxy/nodefaultlib_shim.h b/src/host/proxy/nodefaultlib_shim.h index 09c0ad53c8..4face4e49f 100644 --- a/src/host/proxy/nodefaultlib_shim.h +++ b/src/host/proxy/nodefaultlib_shim.h @@ -1,18 +1,8 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. +#pragma once + #include -#if !defined(_M_IX86) && !defined(_M_X64) - -// ARM64 doesn't define a (__builtin_)memcmp function without CRT, -// but we need one to compile IID_GENERIC_CHECK_IID. -// Luckily we only ever use memcmp for IIDs. -#pragma function(memcmp) -inline int memcmp(const IID* a, const IID* b, size_t count) -{ - (void)(count); - return 1 - InlineIsEqualGUID(a, b); -} - -#endif +#define memcmp(a, b, c) (!InlineIsEqualGUID(a, b))