Skip to content

Commit 568b6ef

Browse files
XAML-KnightNirmal4G
XAML-Knight
authored and
Nirmal4G
committed
Replace .NET targeted only project references with packages
Since we removed the project files from the repository, the project references to those projects doesn't exist. So, Replace the project references with package references. Also, remove the projects from the solution file. Authored-By: Darren Batchelor <[email protected]> Modified-By: Nirmal Guru <[email protected]>
1 parent 7be644b commit 568b6ef

File tree

10 files changed

+26
-300
lines changed

10 files changed

+26
-300
lines changed

‎Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@
105105
<PackageReference Include="Microsoft.Services.Store.Engagement">
106106
<Version>10.1901.28001</Version>
107107
</PackageReference>
108+
<PackageReference Include="Microsoft.Toolkit">
109+
<Version>7.1.2</Version>
110+
</PackageReference>
108111
<!-- TODO Reintroduce graph controls
109112
<PackageReference Include="Microsoft.Toolkit.Graph.Controls">
110113
<Version>7.0.0-preview2</Version>
@@ -1475,10 +1478,6 @@
14751478
<Project>{75f9ee44-3efa-47bc-aedd-351b9834a0af}</Project>
14761479
<Name>Microsoft.Toolkit.Uwp.UI.Media</Name>
14771480
</ProjectReference>
1478-
<ProjectReference Include="..\Microsoft.Toolkit\Microsoft.Toolkit.csproj">
1479-
<Project>{6fe128a8-cefa-4a61-a987-ec92de6b538e}</Project>
1480-
<Name>Microsoft.Toolkit</Name>
1481-
</ProjectReference>
14821481
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Animations\Microsoft.Toolkit.Uwp.UI.Animations.csproj">
14831482
<Project>{b24a296c-b3eb-4e06-a64e-74ac2d1acc91}</Project>
14841483
<Name>Microsoft.Toolkit.Uwp.UI.Animations</Name>

‎Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@
4949
<PackageTags>UI;XAML;ApplicationView;FrameworkElement;ListView;SurfaceDial;Matrix;Mouse;TextBoxMask;TitleBar;VisualTree;Converters;Extensions;Helpers</PackageTags>
5050
</PropertyGroup>
5151

52+
<ItemGroup>
53+
<PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
54+
</ItemGroup>
55+
5256
<ItemGroup>
5357
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
5458
</ItemGroup>

‎Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<ProjectReference Include="..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
14+
<PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
1515
</ItemGroup>
1616

1717
</Project>

‎SmokeTests/SmokeTests.proj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
<ToolkitPackages>
77
UWPBaseline;
88
UWPBaselineWinUI;
9-
Microsoft.Toolkit;
10-
Microsoft.Toolkit.Diagnostics;
11-
Microsoft.Toolkit.HighPerformance;
12-
Microsoft.Toolkit.Mvvm;
139
Microsoft.Toolkit.Uwp;
1410
Microsoft.Toolkit.Uwp.Connectivity;
1511
Microsoft.Toolkit.Uwp.DeveloperTools;

‎UITests/UITests.App/UITests.App.csproj‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,15 @@
168168
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
169169
<Version>6.2.12</Version>
170170
</PackageReference>
171+
<PackageReference Include="Microsoft.Toolkit">
172+
<Version>7.1.2</Version>
173+
</PackageReference>
174+
<PackageReference Include="Microsoft.Toolkit.Diagnostics">
175+
<Version>7.1.2</Version>
176+
</PackageReference>
177+
<PackageReference Include="Microsoft.Toolkit.Mvvm">
178+
<Version>7.1.2</Version>
179+
</PackageReference>
171180
<PackageReference Include="MUXAppTestHelpers">
172181
<Version>0.0.4</Version>
173182
</PackageReference>
@@ -179,14 +188,6 @@
179188
<None Include="UITests.App.pfx" />
180189
</ItemGroup>
181190
<ItemGroup>
182-
<ProjectReference Include="..\..\Microsoft.Toolkit.HighPerformance\Microsoft.Toolkit.HighPerformance.csproj">
183-
<Project>{7e30d48c-4cd8-47be-b557-10a20391dcc4}</Project>
184-
<Name>Microsoft.Toolkit.HighPerformance</Name>
185-
</ProjectReference>
186-
<ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj">
187-
<Project>{d82ae6e1-e612-434e-acb2-363ee48738d3}</Project>
188-
<Name>Microsoft.Toolkit.Mvvm</Name>
189-
</ProjectReference>
190191
<ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.Connectivity\Microsoft.Toolkit.Uwp.Connectivity.csproj">
191192
<Project>{b1e850ff-dde6-44d5-a830-34250e97a687}</Project>
192193
<Name>Microsoft.Toolkit.Uwp.Connectivity</Name>
@@ -243,10 +244,6 @@
243244
<Project>{805f80df-75c6-4c2f-8fd9-b47f6d0df5a3}</Project>
244245
<Name>Microsoft.Toolkit.Uwp</Name>
245246
</ProjectReference>
246-
<ProjectReference Include="..\..\Microsoft.Toolkit\Microsoft.Toolkit.csproj">
247-
<Project>{6fe128a8-cefa-4a61-a987-ec92de6b538e}</Project>
248-
<Name>Microsoft.Toolkit</Name>
249-
</ProjectReference>
250247
</ItemGroup>
251248
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
252249
<VisualStudioVersion>14.0</VisualStudioVersion>

‎UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<ItemGroup>
1515
<!-- MSTest -->
16+
<PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
1617
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
1718
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
1819
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />

‎UnitTests/UnitTests.UWP/UnitTests.UWP.csproj‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,12 @@
128128
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
129129
<Version>6.2.12</Version>
130130
</PackageReference>
131+
<PackageReference Include="Microsoft.Toolkit">
132+
<Version>7.1.2</Version>
133+
</PackageReference>
134+
<PackageReference Include="Microsoft.Toolkit.Diagnostics">
135+
<Version>7.1.2</Version>
136+
</PackageReference>
131137
<PackageReference Include="Microsoft.UI.Xaml">
132138
<Version>2.7.0</Version>
133139
</PackageReference>
@@ -286,14 +292,6 @@
286292
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
287293
</ItemGroup>
288294
<ItemGroup>
289-
<ProjectReference Include="..\..\Microsoft.Toolkit.Diagnostics\Microsoft.Toolkit.Diagnostics.csproj">
290-
<Project>{76f89522-ca28-458d-801d-947ab033a758}</Project>
291-
<Name>Microsoft.Toolkit.Diagnostics</Name>
292-
</ProjectReference>
293-
<ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj">
294-
<Project>{d82ae6e1-e612-434e-acb2-363ee48738d3}</Project>
295-
<Name>Microsoft.Toolkit.Mvvm</Name>
296-
</ProjectReference>
297295
<ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.Connectivity\Microsoft.Toolkit.Uwp.Connectivity.csproj">
298296
<Project>{b1e850ff-dde6-44d5-a830-34250e97a687}</Project>
299297
<Name>Microsoft.Toolkit.Uwp.Connectivity</Name>
@@ -342,10 +340,6 @@
342340
<Project>{805f80df-75c6-4c2f-8fd9-b47f6d0df5a3}</Project>
343341
<Name>Microsoft.Toolkit.Uwp</Name>
344342
</ProjectReference>
345-
<ProjectReference Include="..\..\Microsoft.Toolkit\Microsoft.Toolkit.csproj">
346-
<Project>{6fe128a8-cefa-4a61-a987-ec92de6b538e}</Project>
347-
<Name>Microsoft.Toolkit</Name>
348-
</ProjectReference>
349343
</ItemGroup>
350344
<ItemGroup>
351345
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
@@ -356,7 +350,6 @@
356350
<SubType>Designer</SubType>
357351
</ApplicationDefinition>
358352
</ItemGroup>
359-
<Import Project="..\UnitTests.Shared\UnitTests.Shared.projitems" Label="Shared" />
360353
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
361354
<VisualStudioVersion>14.0</VisualStudioVersion>
362355
</PropertyGroup>

‎UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,6 @@
193193
<Project>{805f80df-75c6-4c2f-8fd9-b47f6d0df5a3}</Project>
194194
<Name>Microsoft.Toolkit.Uwp</Name>
195195
</ProjectReference>
196-
<ProjectReference Include="..\..\Microsoft.Toolkit\Microsoft.Toolkit.csproj">
197-
<Project>{6fe128a8-cefa-4a61-a987-ec92de6b538e}</Project>
198-
<Name>Microsoft.Toolkit</Name>
199-
</ProjectReference>
200196
</ItemGroup>
201197
<ItemGroup>
202198
<Page Include="TestsPage.xaml">

0 commit comments

Comments
 (0)