Skip to content

Commit db7693b

Browse files
jonwisjonwis
authored
Merge branch 'master' into user/dmachaj/no-loadlibrary
2 parents 98ff9f3 + 69c78cf commit db7693b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+810
-293
lines changed

‎.config/tsaoptions.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"instanceUrl": "https://microsoft.visualstudio.com",
3+
"projectName": "os",
4+
"areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\AmUse- App Metadata and User Setup Experience\\Projections\\Cppwinrt",
5+
"notificationAliases": [ "[email protected]" ],
6+
"ignoreBranchName": true,
7+
"codebaseName": "cppwinrt"
8+
}

‎.gdn/.gdnsettings‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"files": { },
3+
"folders": { },
4+
"overwriteLogs": true,
5+
"telemetryFlushTimeout": 10,
6+
"variables": { }
7+
}

‎.gdn/.gitignore‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## Ignore Guardian internal files
2+
.r/
3+
rc/
4+
rs/
5+
i/
6+
p/
7+
c/
8+
o/
9+
10+
## Ignore Guardian Local settings
11+
LocalSettings.gdn.json

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@v4
2727

28-
- id: setup-llvm
29-
name: Set up LLVM (MSVC)
30-
uses: ./.github/actions/setup-llvm-msvc
31-
if: matrix.compiler == 'clang-cl'
32-
3328
- name: Download nuget
3429
run: |
3530
mkdir ".\.nuget"
@@ -49,7 +44,7 @@ jobs:
4944
$target_version = "1.2.3.4"
5045
$props = "Configuration=$target_configuration,Platform=$target_platform,CppWinRTBuildVersion=$target_version"
5146
if ("${{ matrix.compiler }}" -eq "clang-cl") {
52-
$props += ",Clang=1,PlatformToolset=LLVM_v143,LLVMInstallDir=${{ steps.setup-llvm.outputs.llvm-path }}"
47+
$props += ",Clang=1,PlatformToolset=ClangCl"
5348
}
5449
Add-Content $env:GITHUB_ENV "msbuild_config_props=/p:$props"
5550
@@ -109,11 +104,6 @@ jobs:
109104
steps:
110105
- uses: actions/checkout@v4
111106

112-
- id: setup-llvm
113-
name: Set up LLVM (MSVC)
114-
uses: ./.github/actions/setup-llvm-msvc
115-
if: matrix.compiler == 'clang-cl'
116-
117107
- name: Fetch cppwinrt executables
118108
if: matrix.arch != 'arm64'
119109
uses: actions/download-artifact@v4
@@ -147,7 +137,7 @@ jobs:
147137
$target_version = "1.2.3.4"
148138
$props = "Configuration=$target_configuration,Platform=$target_platform,CppWinRTBuildVersion=$target_version"
149139
if ("${{ matrix.compiler }}" -eq "clang-cl") {
150-
$props += ",Clang=1,PlatformToolset=LLVM_v143,LLVMInstallDir=${{ steps.setup-llvm.outputs.llvm-path }}"
140+
$props += ",Clang=1,PlatformToolset=ClangCl"
151141
}
152142
Add-Content $env:GITHUB_ENV "msbuild_config_props=/p:$props"
153143

‎.pipelines/OneBranch.Official.yml‎

Lines changed: 24 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,26 @@ extends:
2727
platform:
2828
name: 'windows_undocked'
2929
product: 'build_tools'
30+
31+
featureFlags:
32+
WindowsHostVersion:
33+
Version: 2022
3034

3135
cloudvault:
3236
enabled: false
3337

3438
globalSdl:
39+
isNativeCode: true
40+
asyncSdl:
41+
enabled: true
3542
tsa:
36-
enabled: false
43+
enabled: true
44+
codeql:
45+
compiled:
46+
enabled: true
47+
tsaEnabled: true
48+
prefast:
49+
enabled: true
3750

3851
stages:
3952
- stage: build
@@ -68,48 +81,6 @@ extends:
6881
ob_createvpack_metadata: $(Build.SourceBranchName).x86.$(Build.BuildNumber).$(Build.SourceVersion)
6982
ob_createvpack_target: $(OSBuildToolsRoot)\cppwinrt
7083

71-
steps:
72-
- task: UseDotNet@2
73-
continueOnError: true
74-
inputs:
75-
packageType: 'runtime'
76-
version: '6.x'
77-
performMultiLevelLookup: true
78-
79-
- task: DownloadPipelineArtifact@2
80-
displayName: 'Download x86 artifacts'
81-
inputs:
82-
artifactName: 'drop_build_x86'
83-
targetPath: '$(Build.SourcesDirectory)/x86'
84-
85-
- task: CopyFiles@2
86-
displayName: 'Stage compiler vpack contents'
87-
inputs:
88-
SourceFolder: $(Build.SourcesDirectory)/x86/cppwinrt
89-
Contents: |
90-
cppwinrt.exe
91-
cppwinrt.pdb
92-
TargetFolder: $(ob_outputDirectory)
93-
94-
- job: MSBuild_vpack
95-
pool:
96-
type: windows
97-
variables:
98-
ob_outputDirectory: '$(Build.SourcesDirectory)\out'
99-
100-
ob_createvpack_enabled: true
101-
ob_createvpack_packagename: CppWinRT.MSBuild
102-
ob_createvpack_owneralias: cpp4uwpt
103-
ob_createvpack_description: C++/WinRT MSBuild
104-
ob_createvpack_provData: true
105-
ob_createvpack_versionAs: parts
106-
ob_createvpack_majorVer: $(MajorVersion)
107-
ob_createvpack_minorVer: $(MinorVersion)
108-
ob_createvpack_patchVer: $(PatchVersion)
109-
ob_createvpack_metadata: $(Build.SourceBranchName).$(Build.BuildNumber).$(Build.SourceVersion)
110-
ob_createvpack_verbose: true
111-
ob_createvpack_target: $(OSBuildToolsRoot)\cppwinrt
112-
11384
steps:
11485
- task: UseDotNet@2
11586
continueOnError: true
@@ -135,14 +106,21 @@ extends:
135106
inputs:
136107
artifactName: 'drop_build_arm64'
137108
targetPath: '$(Build.SourcesDirectory)/arm64'
109+
110+
- task: CopyFiles@2
111+
displayName: 'Stage compiler vpack contents'
112+
inputs:
113+
SourceFolder: $(Build.SourcesDirectory)/x86/cppwinrt
114+
Contents: |
115+
cppwinrt.exe
116+
cppwinrt.pdb
117+
TargetFolder: $(ob_outputDirectory)
138118

139119
- task: CmdLine@2
140120
displayName: 'Stage MSBuild vpack contents'
141121
inputs:
142122
script: |
143123
set TargetDir=$(ob_outputDirectory)
144-
rd /s /q %TargetDir% >nul 2>&1
145-
md %TargetDir%
146124
cd %TargetDir%
147125
148126
copy $(Build.SourcesDirectory)\vsix\Microsoft.Cpp.CppWinRT.props
@@ -154,7 +132,7 @@ extends:
154132
echo d | xcopy $(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib build\native\lib\amd64
155133
echo d | xcopy $(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib build\native\lib\x64
156134
echo d | xcopy $(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib build\native\lib\arm64
157-
135+
158136
- stage: NuGet
159137
dependsOn: build
160138
jobs:

‎.pipelines/OneBranch.PullRequest.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,18 @@ extends:
3131
name: 'windows_undocked'
3232
product: 'build_tools'
3333

34+
featureFlags:
35+
WindowsHostVersion:
36+
Version: 2022
37+
3438
globalSdl:
39+
isNativeCode: true
3540
tsa:
3641
enabled: false
3742
sbom:
3843
enabled: true
44+
prefast:
45+
enabled: true
3946

4047
stages:
4148
- stage: build

‎.pipelines/jobs/OneBranchBuild.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ jobs:
3131
${{ if eq(parameters.OfficialBuild, 'false') }}:
3232
ob_sdl_codeSignValidation_excludes: '-|**\*.exe;-|**\*.dll'
3333

34+
ob_sdl_prefast_enabled: true
35+
ob_sdl_prefast_runDuring: 'Build'
36+
ob_sdl_checkCompliantCompilerWarnings: true
37+
3438
ob_symbolsPublishing_enabled: ${{ parameters.OfficialBuild }}
3539
ob_symbolsPublishing_symbolsFolder: '$(ob_outputDirectory)'
3640
ob_symbolsPublishing_searchPattern: '**\*.pdb'

‎.pipelines/jobs/OneBranchNuGet.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ jobs:
1717
ob_outputDirectory: '$(Build.SourcesDirectory)\out'
1818
PackageVersion: ${{ parameters.BuildVersion }}
1919

20+
ob_sdl_prefast_enabled: true
21+
ob_sdl_prefast_runDuring: 'Build'
22+
ob_sdl_checkCompliantCompilerWarnings: true
23+
2024
steps:
2125
- task: UseDotNet@2
2226
continueOnError: true

‎.pipelines/jobs/OneBranchTest.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ jobs:
5151
ob_artifactSuffix: $(TestExe).$(BuildPlatform)
5252
ob_sdl_codeSignValidation_excludes: '-|**\*.exe;-|**\*.dll'
5353

54+
ob_sdl_prefast_enabled: true
55+
ob_sdl_prefast_runDuring: 'Build'
56+
ob_sdl_checkCompliantCompilerWarnings: true
57+
5458
BuildPath: '$(Build.SourcesDirectory)/_build/$(BuildPlatform)/${{ parameters.BuildConfiguration }}'
5559

5660
steps:

‎.pipelines/jobs/OneBranchVsix.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ jobs:
3636
ob_symbolsPublishing_symbolsFolder: '$(ob_outputDirectory)'
3737
ob_symbolsPublishing_searchPattern: '**\*.pdb'
3838
ob_symbolsPublishing_indexSources: true
39+
40+
ob_sdl_prefast_enabled: true
41+
ob_sdl_prefast_runDuring: 'Build'
42+
ob_sdl_checkCompliantCompilerWarnings: true
3943

4044
steps:
4145
- task: UseDotNet@2

0 commit comments

Comments
 (0)