Skip to content

Remove System.Collections.Immutable dependency where not needed #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Arlodotexe merged 4 commits into from
Jun 1, 2023
Merged

Remove System.Collections.Immutable dependency where not needed #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9745bf7
Made System.Collections.Immutable a non-transient dependency
Arlodotexe May 31, 2023
90aba63
Removed all unused dependencies on System.Collections.Immutable
Arlodotexe Jun 1, 2023
37cd223
Remove PrivateAssets
Arlodotexe Jun 1, 2023
ae15b1d
Merge branch 'main' into fix/dependencies/system.collections.immutable-
Arlodotexe Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.Text;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.Collections.Immutable;
using System.ComponentModel.DataAnnotations;

namespace CommunityToolkit.Tooling.SampleGen.Tests;
Expand Down
1 change: 1 addition & 0 deletions CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using CommunityToolkit.Tooling.SampleGen.Metadata;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Text;
using System.Collections.Immutable;

namespace CommunityToolkit.Tooling.SampleGen;

Expand Down
1 change: 1 addition & 0 deletions CommunityToolkit.Tooling.TestGen.Tests/UIThreadTestMethodTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.Collections.Immutable;

namespace CommunityToolkit.Tooling.TestGen.Tests;

Expand Down
1 change: 0 additions & 1 deletion GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

global using System;
global using System.Collections.Generic;
global using System.Collections.Immutable;
global using System.Collections.ObjectModel;
global using System.ComponentModel;
global using System.Diagnostics;
Expand Down
1 change: 0 additions & 1 deletion MultiTarget/Library.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />

<!-- Add platform package dependencies -->
<Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\Netstandard.props" Condition="$(IsNetstandard) == 'true'" />
<Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\Uno.props" Condition="$(IsUno) == 'true'" />
<Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\Uwp.props" Condition="$(IsUwp) == 'true'"/>
<Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\WinAppSdk.props" Condition="$(IsWinAppSdk) == 'true'"/>
Expand Down
5 changes: 0 additions & 5 deletions MultiTarget/PackageReferences/Netstandard.props
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion MultiTarget/PackageReferences/Uwp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project>
<ItemGroup>
<PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.UI.Xaml" Version="2.7.0" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
</ItemGroup>
</Project>
5 changes: 3 additions & 2 deletions ToolkitComponent.SampleProject.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
<Target Name="CheckComponentName">
<Error Condition="$(ToolkitComponentName) == ''" Message="ToolkitComponentName is not defined. Please check your csproj." />
</Target>

<!-- Set up the MultiTarget system -->
<Import Project="$(ToolingDirectory)\MultiTarget\Library.props" />

<!-- Import this component's source project -->
<ItemGroup>
<ProjectReference Include="$(MSBuildProjectDirectory)\..\src\*.csproj" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -25,7 +26,7 @@
<!-- Manually include XAML files, except under UWP in Release mode. The files already exist in the final app package (with some modifications) -->
<Content Condition="!('$(IsUwp)' == 'true' AND '$(Configuration)' == 'Release')" Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />

<!-- Manually include .cs and .md files -->
<!-- Manually include .cs and .md files -->
<Content Include="**\*.cs" Exclude="bin\**\*.cs;obj\**\*.cs" />
<Content Include="**\*.md" Exclude="bin\**\*.md;obj\**\*.md" />
</ItemGroup>
Expand Down