Skip to content
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

Jump to bottom

Fixed PackageId being overridden by MSBuild.Sdk.Extras import #171

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Fixed PackageId being overridden by MSBuild.Sdk.Extras import #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a0b43f
Fixed PackageId being overridden by MSBuild.Sdk.Extras import
Arlodotexe Feb 28, 2024
673142c
Minor cleanup
Arlodotexe Feb 29, 2024
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
2 changes: 0 additions & 2 deletions MultiTarget/Library.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,4 @@

<!-- Import Uno and native dependencies for all multitargeted library projects. -->
<Import Project="$(MSBuildProjectDirectory)\Dependencies.props" Condition="Exists('$(MSBuildProjectDirectory)\Dependencies.props')" />

<Sdk Condition="'$(IsUwp)' == 'true'" Name="MSBuild.Sdk.Extras" Version="3.0.23" />
</Project>
2 changes: 2 additions & 0 deletions ToolkitComponent.SampleProject.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<!-- Set up the MultiTarget system -->
<Import Project="$(ToolingDirectory)\MultiTarget\Library.props" />

<Sdk Condition="'$(IsUwp)' == 'true'" Name="MSBuild.Sdk.Extras" Version="3.0.23" />

<!-- Import this component's source project -->
<ItemGroup>
<ProjectReference Include="$(MSBuildProjectDirectory)\..\src\*.csproj" />
Expand Down
4 changes: 3 additions & 1 deletion ToolkitComponent.SourceProject.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
<PackageId Condition="'$(PackageId)' == ''">$(PackageIdPrefix).$(PackageIdVariant).$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<Sdk Condition="'$(IsUwp)' == 'true'" Name="MSBuild.Sdk.Extras" Version="3.0.23" />

<!-- Auto Generate our own Assembly Info -->
<PropertyGroup>
<PropertyGroup>
<!-- Turn-off .NET based AssemblyInfo.cs generator, see below -->
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
Expand Down
Loading