Skip to content

Commit

Permalink
Using same YamlDotNet version (#517)
Browse files Browse the repository at this point in the history
Co-authored-by: Andrew Petrochuk (from Dev Box) <[email protected]>
  • Loading branch information
petrochuk and anpetroc authored Jan 25, 2024
1 parent f0adbaf commit 69a7ac1
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
3 changes: 2 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
trigger:
- master

pr: none
pr:
- master

pool:
vmImage: 'windows-latest'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -46,7 +46,7 @@
</PackageReference>
</ItemGroup>

<Target Name="PALT" AfterTargets="MinVer">
<Target Name="SetAssemblyVersion" AfterTargets="MinVer">
<PropertyGroup>
<AssemblyVersion>$(MinVer)</AssemblyVersion>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<NoWarn>$(NoWarn);NU1601</NoWarn>
</PropertyGroup>

<Target Name="PALT" AfterTargets="MinVer">
<Target Name="SetAssemblyVersion" AfterTargets="MinVer">
<PropertyGroup>
<AssemblyVersion>$(MinVer)</AssemblyVersion>
</PropertyGroup>
Expand All @@ -50,14 +50,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="2.3.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
6 changes: 3 additions & 3 deletions src/PAModel/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,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",
Expand Down
2 changes: 1 addition & 1 deletion src/PAModelTests/PAModelTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down

0 comments on commit 69a7ac1

Please sign in to comment.