Skip to content

Commit 48c7eb2

Browse files
Nirmal4GNirmal4G
committed
Manage Dependencies centrally
Use Static Graph restore when applicable. Manage Packages Centrally using NuGet's CPVM feature.
1 parent ab3455d commit 48c7eb2

File tree

38 files changed

+286
-272
lines changed

38 files changed

+286
-272
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
[Rr]eleases/
1919
x64/
2020
x86/
21-
build/
2221
bld/
2322
[Bb]in/
2423
[Oo]bj/

‎Directory.Build.props

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project>
22

3+
<Import Project="Directory.Solution.props" />
4+
35
<PropertyGroup>
46
<RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
57
<BuildToolsDirectory>$(RepositoryDirectory)build\</BuildToolsDirectory>
@@ -47,15 +49,15 @@
4749
<EnableTypeInfoReflection>false</EnableTypeInfoReflection>
4850
</PropertyGroup>
4951
<ItemGroup>
50-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
52+
<PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" />
5153
</ItemGroup>
5254
</When>
5355
</Choose>
5456

5557
<Import Project="$(BuildToolsDirectory)Windows.Toolkit.VisualStudio.Design.props" Condition="$(IsDesignProject)" />
5658

5759
<ItemGroup>
58-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
60+
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="All" />
5961
</ItemGroup>
6062

6163
<Choose>
@@ -69,7 +71,7 @@
6971
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
7072
</PropertyGroup>
7173
<ItemGroup>
72-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
74+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
7375
</ItemGroup>
7476
</When>
7577
</Choose>

‎Directory.Packages.props

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
<Project>
2+
3+
<PropertyGroup Label="Core">
4+
<NETStandardImplicitPackageVersion>2.0.3</NETStandardImplicitPackageVersion>
5+
<ExtrasUwpMetaPackageVersion>6.2.12</ExtrasUwpMetaPackageVersion>
6+
</PropertyGroup>
7+
8+
<ItemGroup Label="Core">
9+
<!-- UWP SDK -->
10+
<PackageVersion Include="Win2D.uwp" Version="1.26.0" />
11+
<PackageVersion Include="ColorCode.UWP" Version="2.0.9" />
12+
<PackageVersion Include="Microsoft.UI.Xaml" Version="2.6.1" />
13+
<PackageVersion Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1" />
14+
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
15+
<!-- MSBuild SDK Extras refernces the following package implicitly -->
16+
<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.12" Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'" />
17+
<!-- C# Compiler SDK -->
18+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
19+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" />
20+
</ItemGroup>
21+
22+
<ItemGroup Label="Global">
23+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
24+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.4.231" />
25+
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
26+
</ItemGroup>
27+
28+
<ItemGroup Label="Samples">
29+
<!-- Store Services SDK -->
30+
<PackageVersion Include="Microsoft.Services.Store.Engagement" Version="10.1901.28001" />
31+
<!-- Forms and Graph Toolkit -->
32+
<PackageVersion Include="Microsoft.Toolkit.Forms.UI.XamlHost" Version="6.1.3" />
33+
<PackageVersion Include="Microsoft.Toolkit.Graph.Controls" Version="7.0.0-preview2" />
34+
<PackageVersion Include="Microsoft.Toolkit.Win32.UI.XamlApplication" Version="6.1.3" />
35+
<!-- Monaco JS Text Editor for WinRT JS -->
36+
<PackageVersion Include="Monaco.Editor" Version="0.8.1-alpha" />
37+
<!-- Notifications Visualizer -->
38+
<PackageVersion Include="NotificationsVisualizerLibrary" Version="1.0.5" />
39+
</ItemGroup>
40+
41+
<ItemGroup Label="Tests">
42+
<!-- MSTest -->
43+
<PackageVersion Include="MSTest.TestAdapter" Version="2.2.5" />
44+
<PackageVersion Include="MSTest.TestFramework" Version="2.2.5" />
45+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
46+
<!-- Test Helpers -->
47+
<PackageVersion Include="FluentAssertions" Version="6.0.0" />
48+
<!-- DO NOT UPGRADE: This version is used for upgrade testing between 6.1.1 and 7.0.0 for the Object Serializers -->
49+
<PackageVersion Include="Newtonsoft.Json" Version="10.0.3" Pin="true" />
50+
<!-- WinUI Test Infra -->
51+
<PackageVersion Include="MUXAppTestHelpers" Version="0.0.4" />
52+
<PackageVersion Include="MUXTestInfra.TAEF" Version="0.0.4" />
53+
<PackageVersion Include="MUXTestInfra.MSTest" Version="0.0.4" />
54+
<PackageVersion Include="MUXCustomBuildTasks" Version="1.0.67" />
55+
<PackageVersion Include="TAEF.Redist.Wlk" Version="10.57.200928001" />
56+
<!-- Windows App Test Infra -->
57+
<PackageVersion Include="Microsoft.Windows.Apps.Test" Version="1.0.181205002" />
58+
</ItemGroup>
59+
60+
<ItemGroup Label="System">
61+
<!-- BCL Extensions -->
62+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
63+
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
64+
<!-- Dependency Injection -->
65+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
66+
<!-- Windows Registry -->
67+
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
68+
<!-- Annotations -->
69+
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
70+
<!-- Diagnostics -->
71+
<PackageVersion Include="System.Diagnostics.Contracts" Version="4.3.0" />
72+
<PackageVersion Include="System.Diagnostics.Process" Version="4.3.0" />
73+
<!-- Drawing -->
74+
<PackageVersion Include="System.Drawing.Common" Version="5.0.2" />
75+
<PackageVersion Include="System.Drawing.Primitives" Version="4.3.0" />
76+
<!-- Memory -->
77+
<PackageVersion Include="System.Memory" Version="4.5.4" />
78+
<!-- Numerics -->
79+
<PackageVersion Include="System.Numerics.Vectors" Version="4.5.0" />
80+
<!-- Reflection -->
81+
<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
82+
<PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />
83+
<!-- Runtime -->
84+
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
85+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
86+
<!-- Tasks -->
87+
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
88+
<PackageVersion Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
89+
<!-- Text - JSON -->
90+
<PackageVersion Include="System.Text.Json" Version="5.0.2" />
91+
<!-- Text - XML -->
92+
<PackageVersion Include="System.Xml.ReaderWriter" Version="4.3.1" />
93+
<PackageVersion Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
94+
</ItemGroup>
95+
96+
</Project>

‎Directory.Solution.props

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>True</ManagePackageVersionsCentrally>
5+
<RestoreUseStaticGraphEvaluation>True</RestoreUseStaticGraphEvaluation>
6+
</PropertyGroup>
7+
8+
<!-- Options that are supported only when using the Full MSBuild! -->
9+
<PropertyGroup Condition="'$(MSBuildRuntimeType)' == 'Full'">
10+
<!-- Static Graph Restore doesn't yet support targets like uap10.0 framework -->
11+
<RestoreUseStaticGraphEvaluation>False</RestoreUseStaticGraphEvaluation>
12+
</PropertyGroup>
13+
14+
</Project>

‎GazeInputTest/GazeInputTest.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,7 @@
141141
</Page>
142142
</ItemGroup>
143143
<ItemGroup>
144-
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
145-
<Version>6.2.12</Version>
146-
</PackageReference>
144+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
147145
</ItemGroup>
148146
<ItemGroup>
149147
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj">

‎Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
<When Condition="'$(TargetFramework)' == 'netstandard1.4'">
2121
<!-- .NET Standard 1.4 doesn't have the Span<T> type, ValueTuple or the [Pure] attribute -->
2222
<ItemGroup>
23-
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
24-
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
25-
<PackageReference Include="System.Memory" Version="4.5.4" />
23+
<PackageReference Include="System.Diagnostics.Contracts" />
24+
<PackageReference Include="System.ValueTuple" />
25+
<PackageReference Include="System.Memory" />
2626
</ItemGroup>
2727
</When>
2828

2929
<When Condition="'$(TargetFramework)' == 'netstandard2.0'">
3030
<!-- .NET Standard 2.0 doesn't have the Span<T> type -->
3131
<ItemGroup>
32-
<PackageReference Include="System.Memory" Version="4.5.4" />
32+
<PackageReference Include="System.Memory" />
3333
</ItemGroup>
3434
</When>
3535

@@ -39,11 +39,12 @@
3939
</PropertyGroup>
4040
<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
4141
<ItemGroup>
42-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
42+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
4343
</ItemGroup>
4444
</When>
4545

4646
<When Condition="'$(TargetFramework)' == 'net5.0'">
47+
<!-- .NET 5 SDK doesn't define "NETSTANDARD2_1_OR_GREATER" until a later revision -->
4748
<PropertyGroup>
4849
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
4950
</PropertyGroup>

‎Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj

+15-15
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
- Box&lt;T&gt;: a type mapping boxed value types and exposing some utility and high performance methods.
2424
- Ref&lt;T&gt;: a stack-only struct that can store a reference to a value of a specified type.
2525
- NullableRef&lt;T&gt;: a stack-only struct similar to Ref&lt;T&gt;, which also supports nullable references.
26-
</Description>
26+
</Description>
2727
<PackageTags>Parallel;Performance;Unsafe;Span;Memory;String;StringPool;Array;Stream;Buffer;Extensions;Helpers</PackageTags>
2828
</PropertyGroup>
2929

@@ -39,23 +39,23 @@
3939
which is used by the Box<T> type in the package.
4040
-->
4141
<ItemGroup>
42-
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
43-
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
44-
<PackageReference Include="System.Memory" Version="4.5.4" />
45-
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
46-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
47-
<PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
48-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
42+
<PackageReference Include="System.Diagnostics.Contracts" />
43+
<PackageReference Include="System.Drawing.Primitives" />
44+
<PackageReference Include="System.Memory" />
45+
<PackageReference Include="System.Numerics.Vectors" />
46+
<PackageReference Include="System.Threading.Tasks.Extensions" />
47+
<PackageReference Include="System.Threading.Tasks.Parallel" />
48+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
4949
</ItemGroup>
5050
</When>
5151

5252
<When Condition="'$(TargetFramework)' == 'netstandard2.0'">
5353
<!-- .NET Standard 2.0 doesn't have the Span<T>, HashCode and ValueTask types -->
5454
<ItemGroup>
55-
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0" />
56-
<PackageReference Include="System.Memory" Version="4.5.4" />
57-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
58-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
55+
<PackageReference Include="Microsoft.Bcl.HashCode" />
56+
<PackageReference Include="System.Memory" />
57+
<PackageReference Include="System.Threading.Tasks.Extensions" />
58+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
5959
</ItemGroup>
6060
</When>
6161

@@ -77,7 +77,7 @@
7777
</PropertyGroup>
7878
<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
7979
<ItemGroup>
80-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
80+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
8181
</ItemGroup>
8282
</When>
8383

@@ -101,7 +101,7 @@
101101
<DefineConstants>NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT;NETCORE_RUNTIME</DefineConstants>
102102
</PropertyGroup>
103103
<ItemGroup>
104-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
104+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
105105
</ItemGroup>
106106
</When>
107107

@@ -110,7 +110,7 @@
110110
<DefineConstants>SPAN_RUNTIME_SUPPORT;NETCORE_RUNTIME</DefineConstants>
111111
</PropertyGroup>
112112
<ItemGroup>
113-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
113+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
114114
</ItemGroup>
115115
</When>
116116
</Choose>

‎Microsoft.Toolkit.Mvvm.SourceGenerators/Microsoft.Toolkit.Mvvm.SourceGenerators.csproj

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<LangVersion>9.0</LangVersion>
6-
<Nullable>enable</Nullable>
4+
<Nullable>Enable</Nullable>
75
<IsPackable>false</IsPackable>
6+
<TargetFramework>netstandard2.0</TargetFramework>
87
</PropertyGroup>
98

109
<ItemGroup>
11-
<Compile Remove="EmbeddedResources\INotifyPropertyChanged.cs" />
12-
<Compile Remove="EmbeddedResources\NotNullAttribute.cs" />
13-
<Compile Remove="EmbeddedResources\NotNullIfNotNullAttribute.cs" />
14-
<Compile Remove="EmbeddedResources\ObservableObject.cs" />
15-
<Compile Remove="EmbeddedResources\ObservableRecipient.cs" />
10+
<Compile Remove="EmbeddedResources\*.cs" />
1611
</ItemGroup>
1712

1813
<ItemGroup>
@@ -34,12 +29,12 @@
3429
</ItemGroup>
3530

3631
<ItemGroup>
37-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" PrivateAssets="all" Pack="false" />
32+
<AdditionalFiles Include="AnalyzerReleases.Shipped.md" />
33+
<AdditionalFiles Include="AnalyzerReleases.Unshipped.md" />
3834
</ItemGroup>
3935

4036
<ItemGroup>
41-
<AdditionalFiles Include="AnalyzerReleases.Shipped.md" />
42-
<AdditionalFiles Include="AnalyzerReleases.Unshipped.md" />
37+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="All" Pack="false" />
4338
</ItemGroup>
4439

4540
</Project>

‎Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525

2626
<!-- .NET Standard 2.0 doesn't have the Span<T> and IAsyncEnumerable<T> types -->
2727
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
28-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
29-
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
30-
<PackageReference Include="System.Memory" Version="4.5.4" />
28+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
29+
<PackageReference Include="System.ComponentModel.Annotations" />
30+
<PackageReference Include="System.Memory" />
3131
</ItemGroup>
3232

3333
<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
3434
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
35-
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
36-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
35+
<PackageReference Include="System.ComponentModel.Annotations" />
36+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
3737
</ItemGroup>
38-
38+
3939
<!-- Source generator project reference for packing -->
4040
<ItemGroup>
4141
<ProjectReference Include="..\Microsoft.Toolkit.Mvvm.SourceGenerators\Microsoft.Toolkit.Mvvm.SourceGenerators.csproj" PrivateAssets="all" />

0 commit comments

Comments
 (0)