Skip to content

Update / Unify all package versions #162

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
Aug 1, 2023
Merged

Update / Unify all package versions #162

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
d7a4077
Lazy auto version packages and remove versions from packages
michael-hawker Jul 31, 2023
ac98828
Attempt to fix NuGet icon
michael-hawker Jul 31, 2023
068f479
Automates all AssemblyGeneration into the props file for libraries
michael-hawker Jul 31, 2023
0c8a06d
Fix extra InternalsVisibleTo needed for build
michael-hawker Jul 31, 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
4 changes: 4 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<Project>
<PropertyGroup>
<MajorVersion>8</MajorVersion>
<MinorVersion>0</MinorVersion>
<PreviewVersion>preview</PreviewVersion>

<PackageIdPrefix>CommunityToolkit</PackageIdPrefix>
<RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
<ToolingDirectory>$(RepositoryDirectory)\tooling</ToolingDirectory>
Expand Down
9 changes: 4 additions & 5 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
<PackageTags Condition="'$(PackageTags)' == ''">$(CommonTags)</PackageTags>
</PropertyGroup>

<!-- TODO: Include these in the shared space -->
<!--<ItemGroup Condition="$(IsPackable)">
<None Include="$(RepositoryDirectory)nuget.png" Pack="true" PackagePath="\Icon.png" />
<ItemGroup Condition="$(IsPackable)">
<None Include="$(RepositoryDirectory)Icon.png" Pack="true" PackagePath="\" />
<None Include="$(RepositoryDirectory)License.md" Pack="true" PackagePath="\" />
<None Include="$(RepositoryDirectory)ThirdPartyNotices.txt" Pack="true" PackagePath="\" />
</ItemGroup>-->
<!--<None Include="$(RepositoryDirectory)ThirdPartyNotices.txt" Pack="true" PackagePath="\" />-->
</ItemGroup>

<ItemGroup>
<SlnGenSolutionItem Include="$(MSBuildThisFileDirectory).editorconfig" />
Expand Down
Binary file added Icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion Windows.Toolkit.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<PackageProjectUrl>https://github.com/CommunityToolkit/Windows</PackageProjectUrl>
<PackageReleaseNotes>https://github.com/CommunityToolkit/Windows/releases</PackageReleaseNotes>
<PackageIcon>Icon.png</PackageIcon>
<PackageIconUrl>https://raw.githubusercontent.com/CommunityToolkit/Windows/main/nuget.png</PackageIconUrl>
<!-- TODO: Remove when closing https://github.com/CommunityToolkit/Labs-Windows/issues/256 -->
<NoWarn>$(NoWarn);NU1505;NU1504</NoWarn>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/Animations/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions components/Animations/src/CommunityToolkit.WinUI.Animations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@
<PropertyGroup>
<ToolkitComponentName>Animations</ToolkitComponentName>
<Description>This package contains Animations.</Description>
<Version>8.0.0-beta.2</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.AnimationsRns</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<InternalsVisibleTo Include="CommunityToolkit.WinUI.Behaviors.Animations" />
<InternalsVisibleTo Include="CommunityToolkit.WinUI.Media" />
<InternalsVisibleTo Include="CommunityToolkit.WinUI.Behaviors" />

Expand Down
13 changes: 0 additions & 13 deletions components/Behaviors/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/Behaviors/src/CommunityToolkit.WinUI.Behaviors.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>Behaviors</ToolkitComponentName>
<Description>This package contains Behaviors.</Description>
<Version>8.0.0-beta.3</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.BehaviorsRns</RootNamespace>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/CameraPreview/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>CameraPreview</ToolkitComponentName>
<Description>This package contains CameraPreview.</Description>
<Version>8.0.0-beta.1</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.Controls.CameraPreviewRns</RootNamespace>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/Collections/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/Collections/src/CommunityToolkit.WinUI.Collections.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>Collections</ToolkitComponentName>
<Description>This package contains the AdvancedCollectionView and IncrementalLoadingCollection.</Description>
<Version>8.0.0-beta.1</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.CollectionsRns</RootNamespace>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/Converters/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/Converters/src/CommunityToolkit.WinUI.Converters.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>Converters</ToolkitComponentName>
<Description>This package contains Converters.</Description>
<Version>8.0.0-beta.1</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.ConvertersRns</RootNamespace>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/DeveloperTools/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/DeveloperTools/src/CommunityToolkit.WinUI.DeveloperTools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>DeveloperTools</ToolkitComponentName>
<Description>This package contains DeveloperTools.</Description>
<Version>8.0.0-beta.1</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.DeveloperToolsRns</RootNamespace>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/Extensions/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>Extensions</ToolkitComponentName>
<Description>This package contains Extensions.</Description>
<Version>8.0.0-beta.2</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.ExtensionsRns</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand All @@ -20,6 +19,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<!-- TODO: We should figure out a better way to share internal helpers without duplication -->
<!-- e.g. Animations is using ThrowIfNull helper... -->
<InternalsVisibleTo Include="CommunityToolkit.WinUI.Animations" />
<InternalsVisibleTo Include="CommunityToolkit.WinUI.Media" />
</ItemGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/HeaderedControls/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>HeaderedControls</ToolkitComponentName>
<Description>This package contains HeaderedControls.</Description>
<Version>8.0.0-beta.1</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.Controls.HeaderedControlsRns</RootNamespace>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/Helpers/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/Helpers/src/CommunityToolkit.WinUI.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>Helpers</ToolkitComponentName>
<Description>This package contains Helpers.</Description>
<Version>8.0.0-beta.1</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.HelpersRns</RootNamespace>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/ImageCropper/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/ImageCropper/src/CommunityToolkit.WinUI.Controls.ImageCropper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>ImageCropper</ToolkitComponentName>
<Description>This package contains ImageCropper.</Description>
<Version>8.0.0-beta.1</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.Controls.ImageCropperRns</RootNamespace>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/LayoutTransformControl/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions .../LayoutTransformControl/src/CommunityToolkit.WinUI.Controls.LayoutTransformControl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>LayoutTransformControl</ToolkitComponentName>
<Description>This package contains LayoutTransformControl.</Description>
<Version>8.0.0-beta.1</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.Controls.LayoutTransformControlRns</RootNamespace>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/Media/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/Media/src/CommunityToolkit.WinUI.Media.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>Media</ToolkitComponentName>
<Description>This package contains Media.</Description>
<Version>8.0.0-beta.1</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.MediaRns</RootNamespace>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/MetadataControl/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/MetadataControl/src/CommunityToolkit.WinUI.Controls.MetadataControl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>MetadataControl</ToolkitComponentName>
<Description>This package contains MetadataControl.</Description>
<Version>8.0.0-beta.1</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.Controls.MetadataControlRns</RootNamespace>
</PropertyGroup>
Expand Down
15 changes: 0 additions & 15 deletions components/Primitives/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/Primitives/src/CommunityToolkit.WinUI.Controls.Primitives.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>Primitives</ToolkitComponentName>
<Description>This package contains Primitives.</Description>
<Version>8.0.0-beta.1</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.WinUI.Controls.PrimitivesRns</RootNamespace>
</PropertyGroup>
Expand Down
Loading