Merge remote-tracking branch 'origin/main' into dev/migrie/f/rainbows

.github/actions/spelling/allow/allow.txt

@@ -1,77 +1,40 @@
 aci
-admins
 allcolors
-Apc
-apc
-backpressure
 breadcrumb
 breadcrumbs
-bsd
-calt
 ccmp
 ccon
-changelog
 clickable
-clig
 CMMI
+colorbrewer
 consvc
 copyable
-Counterintuitively
-CtrlDToClose
-CVS
-CUI
-cybersecurity
 dalet
-Dcs
 dcs
 deselection
 dialytika
 diffing
 dje
-downside
 downsides
 dze
 dzhe
-DTo
-EDDB
-EDDC
 Emacspeak
-Enum'd
 Fitt
-formattings
 FTCS
-ftp
-fvar
 gantt
-gcc
-geeksforgeeks
 ghe
-github
 gje
 godbolt
-hostname
-hostnames
-https
-hyperlink
 hyperlinking
 hyperlinks
-iconify
-ID
-img
-inlined
-issuetitle
-It'd
 kje
 libfuzzer
-libuv
 liga
 lje
 Llast
-llvm
 Lmid
 locl
 lol
-lorem
 Lorigin
 maxed
 megathread
@@ -80,62 +43,42 @@ mkmk
 mnt
 mru
 nje
-noreply
 notwrapped
 ogonek
-ok'd
 overlined
 perlw
-pipeline
 postmodern
 Powerline
-powerline
 ptys
 pwshw
-quickfix
 qof
 qps
-Remappings
-Retargets
+quickfix
 rclt
 reimplementation
+Remappings
 reserialization
-reserialize
 reserializes
+Retargets
 rlig
 rubyw
 runtimes
 servicebus
 shcha
 similaritytolerance
 slnt
-Sos
-ssh
-sustainability
 stakeholders
+sustainability
 sxn
-timeline
-timelines
-timestamped
 TLDR
-tokenizes
 tonos
 toolset
-truthiness
 tshe
-ubuntu
 UEFI
 uiatextrange
-UIs
 und
-unregister
-versioned
 vsdevcmd
-walkthrough
-walkthroughs
-We'd
 westus
-wildcards
 workarounds
 XBox
 YBox

.github/actions/spelling/expect/expect.txt

@@ -515,6 +515,7 @@ dsound
 DSSCL
 DSwap
 DTest
+DTo
 DTTERM
 dup'ed
 dvi
@@ -737,6 +738,7 @@ HABCDEF
 Hackathon
 HALTCOND
 HANGEUL
+hardlinks
 hashalg
 HASSTRINGS
 hbitmap
@@ -1079,6 +1081,7 @@ MOUSEFIRST
 MOUSEHWHEEL
 MOVESTART
 msb
+msbuildcache
 msctf
 msctls
 msdata
@@ -1488,6 +1491,7 @@ reparented
 reparenting
 replatformed
 Replymessage
+reportfileaccesses
 repositorypath
 Requiresx
 rerasterize
@@ -2004,6 +2008,7 @@ wincontypes
 WINCORE
 windbg
 WINDEF
+windir
 windll
 WINDOWALPHA
 windowdpiapi

.gitignore

@@ -283,3 +283,6 @@ MSG*.bin
 profiles.json
 *.metaproj
 *.swp
+
+# MSBuildCache
+/MSBuildCacheLogs/

Directory.Build.props

@@ -0,0 +1,60 @@
+<Project>
+ <!--
+ NOTE! This file gets written-over entirely by the release builds.
+ Any build logic in this file must be optional and only apply to non-release builds.
+ -->
+
+ <!-- MsBuildCache -->
+ <PropertyGroup>
+ <!-- Off by default -->
+ <MsBuildCacheEnabled Condition="'$(MsBuildCacheEnabled)' == ''">false</MsBuildCacheEnabled>
+
+ <!-- Always off during package restore -->
+ <MsBuildCacheEnabled Condition=" '$(ExcludeRestorePackageImports)' == 'true' ">false</MsBuildCacheEnabled>
+
+ <!-- In Azure pipelines, use Pipeline Caching as the cache storage backend. Otherwise, use the local cache. -->
+ <MSBuildCachePackageName Condition="'$(TF_BUILD)' != ''">Microsoft.MSBuildCache.AzurePipelines</MSBuildCachePackageName>
+ <MSBuildCachePackageName Condition="'$(MSBuildCachePackageName)' == ''">Microsoft.MSBuildCache.Local</MSBuildCachePackageName>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(MSBuildCacheEnabled)' == 'true'">
+ <!-- Change this to bust the cache -->
+ <MSBuildCacheCacheUniverse Condition="'$(MSBuildCacheCacheUniverse)' == ''">202310210737</MSBuildCacheCacheUniverse>
+
+ <!--
+ Visual Studio telemetry reads various ApplicationInsights.config files and other files after the project is finished, likely in a detached process.
+ This is acceptable and should not impact cache correctness.
+ -->
+ <MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
+ $(MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns);
+ \**\ApplicationInsights.config;
+ $(LocalAppData)\Microsoft\VSApplicationInsights\**;
+ $(LocalAppData)\Microsoft\Windows\INetCache\**;
+ A:\;
+ E:\;
+ $(windir)\**;
+ </MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
+
+ <!-- 
+ This repo uses a common output directory with many projects writing duplicate outputs. Allow everything, but note this costs some performance in the form of requiring
+ the cache to use copies instead of hardlinks when pulling from cache.
+ -->
+ <MSBuildCacheIdenticalDuplicateOutputPatterns>$(MSBuildCacheIdenticalDuplicateOutputPatterns);bin\**</MSBuildCacheIdenticalDuplicateOutputPatterns>
+
+ <!-- version of MSBuildCache is not part of the cache key -->
+ <PackagesConfigFile>$(MSBuildThisFileDirectory)\dep\nuget\packages.config</PackagesConfigFile>
+ <MSBuildCacheIgnoredInputPatterns>$(MSBuildCacheIgnoredInputPatterns);$(PackagesConfigFile)</MSBuildCacheIgnoredInputPatterns>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(MSBuildCacheEnabled)' == 'true' and '$(MSBuildCachePackageRoot)' == ''">
+ <PackagesConfigContents>$([System.IO.File]::ReadAllText("$(PackagesConfigFile)"))</PackagesConfigContents>
+ <MSBuildCachePackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(PackagesConfigContents), 'Microsoft.MSBuildCache.*?version="(.*?)"').Groups[1].Value)</MSBuildCachePackageVersion>
+ <MSBuildCachePackageRoot>$(MSBuildThisFileDirectory)packages\$(MSBuildCachePackageName).$(MSBuildCachePackageVersion)</MSBuildCachePackageRoot>
+ <MSBuildCacheSharedCompilationPackageRoot>$(MSBuildThisFileDirectory)packages\Microsoft.MSBuildCache.SharedCompilation.$(MSBuildCachePackageVersion)</MSBuildCacheSharedCompilationPackageRoot>
+ </PropertyGroup>
+
+ <ImportGroup Condition="'$(MSBuildCacheEnabled)' == 'true'">
+ <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).props" />
+ <Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.props" />
+ </ImportGroup>
+</Project>

Directory.Build.targets

@@ -0,0 +1,11 @@
+<Project>
+ <!--
+ NOTE! This file gets written-over entirely by the release builds.
+ Any build logic in this file must be optional and only apply to non-release builds.
+ -->
+
+ <ImportGroup Condition="'$(MSBuildCacheEnabled)' == 'true'">
+ <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).targets" />
+ <Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.targets" />
+ </ImportGroup>
+</Project>

NOTICE.md

@@ -325,6 +325,27 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
 
+## ColorBrewer
+**Source**: [https://colorbrewer2.org/](https://colorbrewer2.org/)
+
+### License
+
+```
+Apache-Style Software License for ColorBrewer software and ColorBrewer Color Schemes
+
+Copyright (c) 2002 Cynthia Brewer, Mark Harrower, and The Pennsylvania State University.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http:https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+```
+
 # Microsoft Open Source
 
 This product also incorporates source code from other Microsoft open source projects, all licensed under the MIT license.

build/pipelines/ci-caching.yml

@@ -1,30 +1,32 @@
 trigger:
  batch: true
-# branches:
-# include:
-# - main
-# - feature/*
-# - gh-readonly-queue/*
-# paths:
-# exclude:
-# - doc/*
-# - samples/*
-# - tools/*
+ branches:
+ include:
+ - main
+ - feature/*
+ - gh-readonly-queue/*
+ paths:
+ exclude:
+ - doc/*
+ - samples/*
+ - tools/*
 
-#pr:
-# branches:
-# include:
-# - main
-# - feature/*
-# paths:
-# exclude:
-# - doc/*
-# - samples/*
-# - tools/*
+pr:
+ branches:
+ include:
+ - main
+ - feature/*
+ paths:
+ exclude:
+ - doc/*
+ - samples/*
+ - tools/*
 
 variables:
  - name: runCodesignValidationInjectionBG
  value: false
+ - name: EnablePipelineCache 
+ value: true
 
 # 0.0.yyMM.dd##
 # 0.0.1904.0900
@@ -55,10 +57,10 @@ stages:
  - template: ./templates-v2/job-build-project.yml
  parameters:
  pool:
- ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
- name: SHINE-OSS-L
- ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+ ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
  name: SHINE-INT-L
+ ${{ else }}:
+ name: SHINE-OSS-L
  buildPlatforms: [x64]
  buildConfigurations: [AuditMode]
  buildEverything: true
@@ -72,15 +74,17 @@ stages:
  - template: ./templates-v2/job-build-project.yml
  parameters:
  pool:
- ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
- name: SHINE-OSS-L
- ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+ ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
  name: SHINE-INT-L
+ ${{ else }}:
+ name: SHINE-OSS-L
  buildPlatforms:
  - ${{ platform }}
  buildConfigurations: [Release]
  buildEverything: true
  keepAllExpensiveBuildOutputs: false
+ ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
+ enableCaching: true
 
  - ${{ if eq(parameters.runTests, true) }}:
  - stage: Test_${{ platform }}