Merge branch 'master' into tehcrash-minVerUpdate

azure-pipelines.yml

@@ -3,7 +3,8 @@
 trigger:
   - master
 
-pr: none
+pr:
+  - master
 
 pool:
   vmImage: 'windows-latest'

src/Microsoft.PowerPlatform.PowerApps.Persistence/Microsoft.PowerPlatform.PowerApps.Persistence.csproj

@@ -21,7 +21,7 @@
       This package is a preview release - use at your own risk.
 
       We have not stabilized on Namespace or Class names with this package as of yet and things will
-      change as we move though the preview.
+      change as we move through the preview.
 
       See https://github.com/microsoft/PowerApps-Tooling/releases for the latest release notes.
     </PackageReleaseNotes>
@@ -46,7 +46,7 @@
     </PackageReference>
   </ItemGroup>
 
-  <Target Name="PALT" AfterTargets="MinVer">
+  <Target Name="SetAssemblyVersion" AfterTargets="MinVer">
     <PropertyGroup>
       <AssemblyVersion>$(MinVer)</AssemblyVersion>
       <FileVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</FileVersion>

src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj

@@ -33,7 +33,7 @@
     <NoWarn>$(NoWarn);NU1601</NoWarn>
   </PropertyGroup>
 
-  <Target Name="PALT" AfterTargets="MinVer">
+  <Target Name="SetAssemblyVersion" AfterTargets="MinVer">
     <PropertyGroup>
       <AssemblyVersion>$(MinVer)</AssemblyVersion>
       <FileVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</FileVersion>
@@ -54,14 +54,14 @@
     </EmbeddedResource>
   </ItemGroup>
 
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="[13.0.1,)" />
     <PackageReference Include="System.Text.Json" Version="[6.0,)" />
     <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
-    <PackageReference Include="YamlDotNet" Version="13.7.1" />
+    <PackageReference Include="YamlDotNet" Version="$(YamlDotNetVersion)" />
   </ItemGroup>
+
   <ItemGroup Condition="'$(GitExists)' == true">
     <PackageReference Include="MinVer" Version="$(MinVerVersion)">
       <PrivateAssets>all</PrivateAssets>

src/PAModel/packages.lock.json

@@ -48,9 +48,9 @@
       },
       "YamlDotNet": {
         "type": "Direct",
-        "requested": "[13.7.1, )",
-        "resolved": "13.7.1",
-        "contentHash": "X4m1PnFcJwvAj1sCDMntg/eZcX96CJLrWMiYnq41KqhFVZPuw63ZTSxIGqgdCwHWHvCAyTxheELC/VDf1HsU2A=="
+        "requested": "[15.1.0, )",
+        "resolved": "15.1.0",
+        "contentHash": "fXrqmKkzBtXeJiHEsZOPEWkonHweiwk/l0Hqhz4yMIZPh57kZy03Xbj2/e8HV1QIkTw7yeBe9bbphuE3YiI4vQ=="
       },
       "Microsoft.Extensions.DependencyInjection": {
         "type": "Transitive",

src/PAModelTests/PAModelTests.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="coverlet.collector" Version="1.2.0" />
-    <PackageReference Include="YamlDotNet" Version="13.7.1" />
+    <PackageReference Include="YamlDotNet" Version="$(YamlDotNetVersion)" />
   </ItemGroup>
 
   <ItemGroup Label="Global usings">