Enable Central Package Manager

ForNeVeR · Sep 3, 2023 · f5e7ae4 · f5e7ae4
1 parent cf08fed
commit f5e7ae4
Show file tree

Hide file tree

Showing 14 changed files with 101 additions and 46 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,38 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="ApprovalTests" Version="4.2.2" />
+    <PackageVersion Include="Avalonia" Version="[11.0.0,12.0.0)" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.0" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.0" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.0.0" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.0" />
+    <PackageVersion Include="ChangelogAutomation.MSBuild" Version="2.0.0" />
+    <PackageVersion Include="coverlet.collector" Version="3.1.2" />
+    <PackageVersion Include="Foq" Version="1.8.0" />
+    <PackageVersion Include="FSharp.Core" Version="$(FSCorePackageVersion)" />
+    <PackageVersion Include="FSharp.Core.Fluent-4.0" Version="1.0.0.6" />
+    <PackageVersion Include="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23060.4" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
+    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageVersion Include="Nullable" Version="1.2.1" />
+    <PackageVersion Include="System.Reactive" Version="6.0.0" />
+    <PackageVersion Include="Verify.Xunit" Version="21.0.0" />
+    <PackageVersion Include="xunit" Version="2.5.0" />
+    <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
+    <PackageVersion Include="xunit.assert" Version="2.5.0" />
+    <PackageVersion Include="xunit.core" Version="2.5.0" />
+    <PackageVersion Include="xunit.extensibility.core" Version="2.5.0" />
+    <PackageVersion Include="xunit.extensibility.execution" Version="2.5.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
+    <PackageVersion Include="Avalonia.Direct2D1" Version="11.0.0" />
+    <PackageVersion Include="System.ValueTuple" Version="4.4.0" />
+  </ItemGroup>
+</Project>
diff --git a/NuGet.Config b/NuGet.Config
@@ -6,4 +6,14 @@
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
         <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" /> <!-- TODO[#337]: Remove later -->
     </packageSources>
+
+    <packageSourceMapping>
+        <packageSource key="nuget.org">
+            <package pattern="*" />
+        </packageSource>
+        <packageSource key="dotnet-eng">
+            <package pattern="Microsoft.DotNet.GenAPI" />
+        </packageSource>
+    </packageSourceMapping>
+
 </configuration>
diff --git a/XamlMath.All.sln b/XamlMath.All.sln
@@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		NuGet.Config = NuGet.Config
 		Directory.Build.props = Directory.Build.props
 		.gitattributes = .gitattributes
+		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "WpfMath.Tests", "src\WpfMath.Tests\WpfMath.Tests.fsproj", "{F19E5FB1-EE6B-4A48-A522-41F30676BE41}"

diff --git a/src/AvaloniaMath.ApiTest/AvaloniaMath.ApiTest.csproj b/src/AvaloniaMath.ApiTest/AvaloniaMath.ApiTest.csproj
@@ -9,15 +9,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23060.4" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-        <PackageReference Include="Verify.Xunit" Version="19.7.1" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="Microsoft.DotNet.GenAPI" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="Verify.Xunit" />
+        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.runner.visualstudio">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.1.2">
+        <PackageReference Include="coverlet.collector">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/src/AvaloniaMath.Example/AvaloniaMath.Example.csproj b/src/AvaloniaMath.Example/AvaloniaMath.Example.csproj
@@ -19,13 +19,13 @@
         <AvaloniaResource Include="Assets\*" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
-        <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0" Condition=" '$(Configuration)' == 'Debug' " />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
+        <PackageReference Include="Avalonia.Desktop" />
+        <PackageReference Include="Avalonia.Diagnostics" Condition=" '$(Configuration)' == 'Debug' " />
+        <PackageReference Include="Avalonia.ReactiveUI" />
+        <PackageReference Include="Avalonia.Themes.Fluent" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
-        <PackageReference Include="Avalonia.Direct2D1" Version="11.0.0" />
+        <PackageReference Include="Avalonia.Direct2D1" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\AvaloniaMath\AvaloniaMath.csproj" />

diff --git a/src/AvaloniaMath/AvaloniaMath.csproj b/src/AvaloniaMath/AvaloniaMath.csproj
@@ -31,10 +31,10 @@
         </AvaloniaResource>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="[11.0.0,12.0.0)" />
-        <PackageReference Include="Nullable" Version="1.2.1" PrivateAssets="All" />
-        <PackageReference Include="ChangelogAutomation.MSBuild" Version="2.0.0" PrivateAssets="All" />
-        <PackageReference Include="System.Reactive" Version="6.0.0" />
+        <PackageReference Include="Avalonia" />
+        <PackageReference Include="Nullable" PrivateAssets="All" />
+        <PackageReference Include="ChangelogAutomation.MSBuild" PrivateAssets="All" />
+        <PackageReference Include="System.Reactive" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\XamlMath.Shared\XamlMath.Shared.csproj" />

diff --git a/src/Tool.TTFMetrics/Tool.TTFMetrics.csproj b/src/Tool.TTFMetrics/Tool.TTFMetrics.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39"/>
+        <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
     </ItemGroup>
 
 </Project>
diff --git a/src/WpfMath.ApiTest/WpfMath.ApiTest.csproj b/src/WpfMath.ApiTest/WpfMath.ApiTest.csproj
@@ -9,14 +9,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23060.4" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="Microsoft.DotNet.GenAPI" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.runner.visualstudio">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.1.2">
+        <PackageReference Include="coverlet.collector">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/src/WpfMath.Example/WpfMath.Example.csproj b/src/WpfMath.Example/WpfMath.Example.csproj
@@ -11,8 +11,8 @@
         <ProjectReference Include="../WpfMath/WpfMath.csproj" />
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-      <PackageReference Include="Nullable" Version="1.2.1">
+      <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
+      <PackageReference Include="Nullable">
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         <PrivateAssets>all</PrivateAssets>
       </PackageReference>

diff --git a/src/WpfMath.Tests/DefaultTexFontTests.fs b/src/WpfMath.Tests/DefaultTexFontTests.fs
@@ -13,15 +13,15 @@ type DefaultTexFontTests() =
 
     [<Fact>]
     member _.``GetCharInfo(char, string, TexStyle) returns a CharInfo for existing character``() =
-        Assert.NotNull <| font.GetCharInfo('x', "text", TexStyle.Text)
+        Assert.NotNull(font.GetCharInfo('x', "text", TexStyle.Text))
 
     [<Fact>]
     member _.``GetCharInfo(char, string, TexStyle) throws a TextStyleMappingNotFoundException for unknown text style``() =
         Assert.IsType<TextStyleMappingNotFoundException>(font.GetCharInfo('x', "unknownStyle", TexStyle.Text).Error)
 
     [<Fact>]
     member _.``GetCharInfo(string, TexStyle) returns a CharInfo for existing symbol``() =
-        Assert.NotNull <| font.GetCharInfo("sqrt", TexStyle.Text)
+        Assert.NotNull(font.GetCharInfo("sqrt", TexStyle.Text))
 
     [<Fact>]
     member _.``GetCharInfo(string, TexStyle) throws a SymbolMappingNotFoundException for unknown symbol``() =
@@ -30,7 +30,7 @@ type DefaultTexFontTests() =
     [<Fact>]
     member _.``GetCharInfo(CharFont, TexStyle) returns a CharInfo for existing symbol``() =
         let char = CharFont('x', 1)
-        Assert.NotNull <| font.GetCharInfo(char, TexStyle.Text)
+        Assert.NotNull(font.GetCharInfo(char, TexStyle.Text))
 
     [<Fact>]
     member _.``GetCharInfo(CharFont, TexStyle) throws a TexCharacterMappingNotFoundException for unknown character``() =

diff --git a/src/WpfMath.Tests/WpfMath.Tests.fsproj b/src/WpfMath.Tests/WpfMath.Tests.fsproj
@@ -5,25 +5,30 @@
         <UseWpf>true</UseWpf>
         <Deterministic>false</Deterministic>
         <EnableWindowsTargeting>true</EnableWindowsTargeting>
+        <LangVersion>preview</LangVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="ApprovalTests" Version="4.2.2" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-        <PackageReference Include="Foq" Version="1.8.0" />
-        <PackageReference Include="FSharp.Core.Fluent-4.0" Version="1.0.0.6" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-        <PackageReference Include="xunit.assert" Version="2.4.1" />
-        <PackageReference Include="xunit.core" Version="2.4.1" />
-        <PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
-        <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+        <PackageReference Include="ApprovalTests" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="Foq" />
+        <PackageReference Include="FSharp.Core" />
+        <PackageReference Include="FSharp.Core.Fluent-4.0" />
+        <PackageReference Include="Newtonsoft.Json" />
+        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.abstractions" />
+        <PackageReference Include="xunit.assert" />
+        <PackageReference Include="xunit.core" />
+        <PackageReference Include="xunit.extensibility.core" />
+        <PackageReference Include="xunit.extensibility.execution" />
+        <PackageReference Include="xunit.runner.visualstudio">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <ProjectReference Include="../WpfMath/WpfMath.csproj" />
     </ItemGroup>
+    <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net470'))">
+        <PackageReference Include="System.ValueTuple" />
+    </ItemGroup>
     <ItemGroup>
         <Compile Include="ApprovalTestUtils.fs" />
         <Compile Include="Utils.fs" />
@@ -46,4 +51,5 @@
         <Compile Include="WpfBrushTests.fs" />
         <None Include="TestResults/*.txt" />
     </ItemGroup>
+
 </Project>
diff --git a/src/WpfMath/WpfMath.csproj b/src/WpfMath/WpfMath.csproj
@@ -15,22 +15,22 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Resource Include="..\..\fonts\*.ttf" LinkBase="Fonts"/>
+        <Resource Include="..\..\fonts\*.ttf" LinkBase="Fonts" />
         <None Include="..\..\fonts\LICENSES.md" Pack="true" PackagePath="\FONT-LICENSES.md" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-        <PackageReference Include="Nullable" Version="1.2.1" PrivateAssets="All"/>
-        <PackageReference Include="ChangelogAutomation.MSBuild" Version="2.0.0" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+        <PackageReference Include="Nullable" PrivateAssets="All" />
+        <PackageReference Include="ChangelogAutomation.MSBuild" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\XamlMath.Shared\XamlMath.Shared.csproj"/>
+        <ProjectReference Include="..\XamlMath.Shared\XamlMath.Shared.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <InternalsVisibleTo Include="$(AssemblyName).Tests"/>
+        <InternalsVisibleTo Include="$(AssemblyName).Tests" />
     </ItemGroup>
 
 </Project>
diff --git a/src/XamlMath.ApiTest.Framework/XamlMath.ApiTest.Framework.csproj b/src/XamlMath.ApiTest.Framework/XamlMath.ApiTest.Framework.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Verify.Xunit" Version="19.7.1" />
+        <PackageReference Include="Verify.Xunit" />
     </ItemGroup>
 
 </Project>
diff --git a/src/XamlMath.Shared/XamlMath.Shared.csproj b/src/XamlMath.Shared/XamlMath.Shared.csproj
@@ -30,6 +30,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="ChangelogAutomation.MSBuild" Version="2.0.0" PrivateAssets="All" />
+        <PackageReference Include="ChangelogAutomation.MSBuild" PrivateAssets="All" />
     </ItemGroup>
 </Project>