microsoft · kmahone · Aug 29, 2024 · Aug 22, 2024 · Aug 22, 2024 · Aug 22, 2024
diff --git a/MUXControls.sln b/MUXControls.sln
diff --git a/build/AzurePipelinesTemplates/MUX-BuildProject-Steps.yml b/build/AzurePipelinesTemplates/MUX-BuildProject-Steps.yml
@@ -20,6 +20,11 @@ steps:
     inputs:
       filename: 'set'
 
+  - powershell: |
+      Get-Volume
+    displayName: 'Display disk space'
+    continueOnError: true
+
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
     displayName: 'NuGet restore ${{ parameters.solutionPath }}'
     inputs:

diff --git a/build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml b/build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml
@@ -13,9 +13,9 @@ parameters:
 jobs:
 - job: ${{ parameters.jobName }}
   pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPoolOSS-S
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPool-S
 
   steps:
@@ -88,13 +88,3 @@ jobs:
     inputs:
       PathtoPublish: '${{ parameters.nupkgdir }}'
       artifactName: 'drop'
-
-# To publish the package to vsts feed, set queue time variable NuGetFeed = d62f8eac-f05c-4c25-bccb-21f98b95c95f
-# This is the magic GUID from the pipeline visual designer for this feed: https://dev.azure.com/ms/microsoft-ui-xaml/_packaging?_a=feed&feed=MUX-CI
-  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-    condition: and(ne(variables['NuGetFeed'], ''), ne(variables['Build.Reason'], 'Manual'))
-    displayName: 'NuGet push to $(NuGetFeed)'
-    inputs:
-      command: push
-      publishVstsFeed: $(NuGetFeed)
-      packagesToPush: $(Build.ArtifactStagingDirectory)/*.nupkg
diff --git a/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml b/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml
@@ -34,9 +34,9 @@ jobs:
       - ${{ parameters.dependsOn }}
 
   pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPoolOSS-S
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPool-S
     demands: ImageOverride -equals WinDevVS16-9
   strategy:

diff --git a/build/AzurePipelinesTemplates/MUX-RunHelixTests-Job.yml b/build/AzurePipelinesTemplates/MUX-RunHelixTests-Job.yml
@@ -23,9 +23,9 @@ jobs:
   dependsOn: ${{ parameters.dependsOn }}
   condition: ${{ parameters.condition }}
   pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPoolOSS-S
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPool-S
   timeoutInMinutes: 120
   strategy:

diff --git a/build/AzurePipelinesTemplates/MUX-RunTestsOnPipeline-Job.yml b/build/AzurePipelinesTemplates/MUX-RunTestsOnPipeline-Job.yml
@@ -14,9 +14,9 @@ jobs:
   dependsOn: ${{ parameters.dependsOn }}
   condition: not(failed())
   pool:
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPoolOSS-Test
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPool-Test
     demands: ImageOverride -equals ${{ parameters.testOS }}
 

diff --git a/build/AzurePipelinesTemplates/MUX-WACKTests-Job.yml b/build/AzurePipelinesTemplates/MUX-WACKTests-Job.yml
@@ -19,9 +19,9 @@ jobs:
 - job: ${{ parameters.name }}
   dependsOn: ${{ parameters.dependsOn }}
   pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPoolOSS-S
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPool-S
   strategy:
     maxParallel: 10

diff --git a/build/MUX-CI.yml b/build/MUX-CI.yml
@@ -8,9 +8,9 @@ stages:
   jobs:
   - job: Build
     pool: 
-      ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+      ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
         name: WinDevPoolOSS-L
-      ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+      ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
         name: WinDevPool-L
       demands: ImageOverride -equals WinDevVS17-latest
     timeoutInMinutes: 120

diff --git a/build/MUX-PR.yml b/build/MUX-PR.yml
@@ -25,11 +25,12 @@ stages:
   - job: Build
     condition: eq(variables['useBuildOutputFromBuildId'],'')
     pool: 
-      ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+      ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
         name: WinDevPoolOSS-L
-      ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+      ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
         name: WinDevPool-L
-      demands: ImageOverride -equals WinDevVS17-latest
+      demands: 
+        - ImageOverride -equals WinDevVS17-latest
     timeoutInMinutes: 120
     strategy:
       maxParallel: 10

diff --git a/build/MUX-SimpleBuildAndTest.yml b/build/MUX-SimpleBuildAndTest.yml
@@ -11,9 +11,9 @@ jobs:
   condition:
     eq(variables['useBuildOutputFromBuildId'],'') 
   pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPoolOSS-L
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPool-L
     demands: ImageOverride -equals WinDevVS17-latest
   timeoutInMinutes: 120

diff --git a/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp b/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp
@@ -10,6 +10,8 @@
 #include <winerror.h>
 #include <math.h>
 
+#pragma warning( disable : 26495)
+
 AnimatedVisualPlayer::AnimationPlay::AnimationPlay(
     AnimatedVisualPlayer& owner,
     float fromProgress,

diff --git a/dev/Collections/HashMap.h b/dev/Collections/HashMap.h
@@ -7,7 +7,7 @@ template <typename K, typename V>
 class HashMap :
     public ReferenceTracker<
         HashMap<K, V>,
-        reference_tracker_implements_t<winrt::IMap<K, V>>::type,
+        typename reference_tracker_implements_t<winrt::IMap<K, V>>::type,
         winrt::IMapView<K, V>,
         winrt::IIterable<winrt::IKeyValuePair<K, V>>>
 {

diff --git a/dev/Collections/Vector.h b/dev/Collections/Vector.h
@@ -574,7 +574,7 @@ template <typename T, bool isObservable, bool isBindable, bool isDependencyObjec
 class VectorBase :
     public ReferenceTracker<
     VectorBase<T, isObservable, isBindable, isDependencyObjectBase, isNoTrackerRef, Options>,
-    reference_tracker_implements_t<typename Options::VectorType>::type,
+    typename reference_tracker_implements_t<typename Options::VectorType>::type,
     typename Options::IterableType,
     std::conditional_t<isObservable, typename Options::ObservableVectorType, void>>,
     public Options::IVectorOwner

diff --git a/dev/Collections/VectorIterator.h b/dev/Collections/VectorIterator.h
@@ -40,7 +40,7 @@ template <typename T, bool isBindable = false, bool isDependencyObjectBase = tru
 class VectorIterator : 
     public ReferenceTracker<
         VectorIterator<T, isBindable, isDependencyObjectBase, Traits>,
-        reference_tracker_implements_t<typename Traits::IteratorType>::type>
+        typename reference_tracker_implements_t<typename Traits::IteratorType>::type>
 {
 public:
     VectorIterator(typename Traits::VectorType const& vector)

diff --git a/dev/CommandBarFlyout/CommandBarFlyout.cpp b/dev/CommandBarFlyout/CommandBarFlyout.cpp
@@ -10,6 +10,8 @@
 
 #include "CommandBarFlyout.properties.cpp"
 
+#pragma warning( disable : 26495)
+
 // Change to 'true' to turn on debugging outputs in Output window
 bool CommandBarFlyoutTrace::s_IsDebugOutputEnabled{ false };
 bool CommandBarFlyoutTrace::s_IsVerboseDebugOutputEnabled{ false };

diff --git a/nuget.config b/nuget.config
@@ -4,7 +4,7 @@
     <clear />
 
     <!-- do not add new sources to this file. If new packages are required, push them to this feed. -->
-    <add key="MUX-Dependencies" value="https://pkgs.dev.azure.com/ms/microsoft-ui-xaml/_packaging/MUX-Dependencies/nuget/v3/index.json" />
+    <add key="MUX-Dependencies" value="https://pkgs.dev.azure.com/shine-oss/microsoft-ui-xaml/_packaging/MUX-Dependencies/nuget/v3/index.json" />
 
     <add key="localpackages" value="localpackages" />
   </packageSources>

diff --git a/tools/MUXPGODatabase/config.ps1 b/tools/MUXPGODatabase/config.ps1
@@ -6,4 +6,8 @@ $packageId           = "MUXPGODatabase"
 $releaseVersionMajor      = ( [int64]::Parse( $customProps.GetElementsByTagName("MUXVersionMajor").'#text' ) )
 $releaseVersionMinor      = ( [int64]::Parse( $customProps.GetElementsByTagName("MUXVersionMinor").'#text' ) )
 $releaseVersionPatch      = [int64] 0
-$releaseVersionPrerelease = $null
+$releaseVersionPrerelease = $null
+
+# We are no longer running the PGO pipeline. WinUI2 development has switched from 'main' branch to 'winui2/main'. 
+# To keep things working without having to re-enable the PGO pipeline we hard-code the last version of MUXPGODatabase here.
+$forkPointDateString = "2310202140"
diff --git a/tools/MUXPGODatabase/restore-pgodb.ps1 b/tools/MUXPGODatabase/restore-pgodb.ps1
@@ -41,9 +41,12 @@ function Install-Package ( $package, $version )
     }
 }
 
-$forkPoint = ( GetForkPoint $pgoBranch )
+# We are no longer running the PGO pipeline. WinUI2 development has switched from 'main' branch to 'winui2/main'. 
+# To keep things working without having to re-enable the PGO pipeline we hard-code the last version of MUXPGODatabase and skip generating it from git history.
+# $forkPoint = ( GetForkPoint $pgoBranch )
+# $requestedVersion = MakeVersion $releaseVersionMajor $releaseVersionMinor $rel4873563b7953e2431caed4efcdc3b8261d1405cdaseVersionPatch $releaseVersionPrerelease $forkPoint.DateString $forkPoint.BranchString
 
-$requestedVersion = MakeVersion $releaseVersionMajor $releaseVersionMinor $releaseVersionPatch $releaseVersionPrerelease $forkPoint.DateString $forkPoint.BranchString
+$requestedVersion = MakeVersion $releaseVersionMajor $releaseVersionMinor $releaseVersionPatch $releaseVersionPrerelease $forkPointDateString $pgoBranch
 
 Write-Host ( "PGO OPTIMIZE: requesting {0} version {1} ({2})" -f $packageId, ( FormatVersion $requestedVersion ), $forkPoint.SHA )