diff --git a/Directory.Build.targets b/Directory.Build.targets index 52e3da3618..7b11db7a98 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,4 +1,5 @@ + $(AssemblyName) ($(TargetFramework)) @@ -11,13 +12,4 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - - diff --git a/src/Uno/Prism.Uno/PrismApplicationBase.cs b/src/Uno/Prism.Uno/PrismApplicationBase.cs index 3e6951dbef..505874f264 100644 --- a/src/Uno/Prism.Uno/PrismApplicationBase.cs +++ b/src/Uno/Prism.Uno/PrismApplicationBase.cs @@ -5,7 +5,6 @@ using Prism.Modularity; using Prism.Mvvm; using Prism.Navigation.Regions; -using Uno.Toolkit; using Application = Microsoft.UI.Xaml.Application; #nullable enable diff --git a/winappsdk-workarounds.targets b/winappsdk-workarounds.targets new file mode 100644 index 0000000000..8d1368af3c --- /dev/null +++ b/winappsdk-workarounds.targets @@ -0,0 +1,27 @@ + + + + + + <_OtherPriFiles Include="@(PackagingOutputs)" Condition="'%(Extension)' == '.pri' and ('%(PackagingOutputs.ReferenceSourceTarget)' == 'ProjectReference' or '%(PackagingOutputs.NugetSourceType)'=='Package')" /> + + + + + + + + <_OtherPriFiles1 Include="@(_ReferenceRelatedPaths)" Condition="'%(Extension)' == '.pri' and ('%(_ReferenceRelatedPaths.ReferenceSourceTarget)' == 'ProjectReference' or '%(_ReferenceRelatedPaths.NugetSourceType)'=='Package')" /> + <_ReferenceRelatedPaths Remove="@(_OtherPriFiles1)" /> + + <_OtherPriFiles2 Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.pri' and ('%(ReferenceCopyLocalPaths.ReferenceSourceTarget)' == 'ProjectReference' or '%(ReferenceCopyLocalPaths.NugetSourceType)'=='Package')" /> + + + +