Merge pull request #8179 from workgroupengineering/fixes/Warinngs/NU5048

fix: Warnings NU5048
unoplatform · Mar 7, 2022 · f3de2ff · f3de2ff
2 parents 4d3e8b5 + c738b2d
commit f3de2ff
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 24 deletions.
diff --git a/src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.csproj b/src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.csproj
@@ -15,7 +15,6 @@
 	<PropertyGroup>
 		<Authors>nventive</Authors>
 		<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
-		<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
 		<PackageIcon>uno.png</PackageIcon>
 		<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
 		<Description>This package provides the extensions to MSAL (Microsoft.Identity.Client) for an Uno Platform application.</Description>

diff --git a/src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.net6.csproj b/src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.net6.csproj
@@ -29,7 +29,6 @@
 	<PropertyGroup>
 		<Authors>nventive</Authors>
 		<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
-		<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
 		<PackageIcon>uno.png</PackageIcon>
 		<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
 		<Description>This package provides the extensions to MSAL (Microsoft.Identity.Client) for an Uno Platform application.</Description>

diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj
@@ -18,7 +18,7 @@
 		<PackageTags>dotnet-new;templates;uno-platform</PackageTags>
 		<Authors>nventive</Authors>
 		<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
-		<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
+		<PackageIcon>uno.png</PackageIcon>
 		<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
 		<Description></Description>
 		<Copyright>Copyright (C) 2015-2019 nventive inc. - all rights reserved</Copyright>
@@ -96,7 +96,7 @@
 
 		<_UnoAppTemplateFiles Include="..\UnoSolutionTemplate\**" Exclude="@(_UnoAppTemplateFilesExclude)" />
 	</ItemGroup>
-	
+
 	<ItemGroup>
 		<_UnoAppnet6TemplateFilesExclude Include="..\UnoSolutionTemplate.net6\**\*.vstemplate" />
 		<_UnoAppnet6TemplateFilesExclude Include="..\UnoSolutionTemplate.net6\__*.png" />
@@ -288,7 +288,7 @@
 			<Version>3.0.0-preview3.201113.0</Version>
 		</PackageReference>
 		<PackageReference Include=""Microsoft.NETCore.UniversalWindowsPlatform"">";
-		
+
 								s = s
 									.Replace(@"<PackageReference Include=""Microsoft.NETCore.UniversalWindowsPlatform"">", replacedNuget);
 							}
@@ -301,11 +301,11 @@
 									.Replace("args.PrelaunchActivated", "args.UWPLaunchActivatedEventArgs.PrelaunchActivated")
 									.Replace("OnLaunched(LaunchActivatedEventArgs", "OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs")
 									.Replace("Windows.UI.Xaml", "Microsoft.UI.Xaml");
-									
+
 								var replacedLogging = @"
 						{ ""Windows"", LogLevel.Warning },
 						{ ""Microsoft"", LogLevel.Warning },";
-		
+
 								s = s
 									.Replace(@"{ ""Windows"", LogLevel.Warning },", replacedLogging);
 							}
@@ -359,7 +359,7 @@
 						var fileName = Path.GetFileName(file);
 						var filePath = Path.GetDirectoryName(file);
 						var updatedFileName = fileName.Replace(SourceName, TargetName);
-						
+
 						File.WriteAllText(file, s);
 
 						if(updatedFileName != fileName)
@@ -396,4 +396,7 @@
 		</Task>
 	</UsingTask>
 
+	<ItemGroup>
+		<None Include="..\..\Common\uno.png" Pack="true" PackagePath="\" Visble="false"/>
+	</ItemGroup>
 </Project>
diff --git a/src/Uno.Foundation.Runtime.WebAssembly/Uno.Foundation.Runtime.WebAssembly.csproj b/src/Uno.Foundation.Runtime.WebAssembly/Uno.Foundation.Runtime.WebAssembly.csproj
@@ -19,11 +19,11 @@
 		<UseCommonOverridePackage>true</UseCommonOverridePackage>
 	</PropertyGroup>
 
+
 	<PropertyGroup>
 		<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
 		<Authors>nventive</Authors>
 		<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
-		<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
 		<PackageIcon>uno.png</PackageIcon>
 		<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
 		<Description>This package provides the .NET interoperability support for WebAssembly in Uno Platform projects.</Description>

diff --git a/src/Uno.UI.Foldable/Uno.UI.Foldable.csproj b/src/Uno.UI.Foldable/Uno.UI.Foldable.csproj
@@ -15,15 +15,15 @@
 	<PropertyGroup>
     <Authors>nventive</Authors>
     <PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
-    <PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
+    <PackageIcon>uno.png</PackageIcon>
     <RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
     <Description>This package provides the ability for Uno Platform based apps to use dual screen devices such as the Surface Duo or Neo</Description>
     <Copyright>Copyright (C) 2015-2020 nventive inc. - all rights reserved</Copyright>
   </PropertyGroup>
 
 	<PropertyGroup>
 		<NoWarn>$(NoWarn);NU1701</NoWarn>
-		
+
 		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
 		<Deterministic>true</Deterministic>
 	</PropertyGroup>
@@ -82,4 +82,8 @@
 	<PropertyGroup>
 		<AndroidLinkSkip>Xamarin.AndroidX.Core;Xamarin.AndroidX.RecyclerView;Xamarin.AndroidX.Window;Xamarin.AndroidX.Window.WindowJava;Xamarin.Kotlin.StdLib;Xamarin.KotlinX.Coroutines.Core</AndroidLinkSkip>
 	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include=".\..\Common\uno.png" Pack="true" PackagePath="\" Visible="false"/>
+	</ItemGroup>
 </Project>
diff --git a/src/Uno.UI.Foldable/Uno.UI.Foldable.net6.csproj b/src/Uno.UI.Foldable/Uno.UI.Foldable.net6.csproj
@@ -22,10 +22,11 @@
 		<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
 	</PropertyGroup>
 
+
 	<PropertyGroup>
     <Authors>nventive</Authors>
     <PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
-    <PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
+    <PackageIcon>uno.png</PackageIcon>
     <RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
     <Description>This package provides the ability for Uno Platform based apps to use dual screen devices such as the Surface Duo or Neo</Description>
     <Copyright>Copyright (C) 2015-2020 nventive inc. - all rights reserved</Copyright>
@@ -66,4 +67,8 @@
 		<Copy SourceFiles="@(_OutputFiles)" DestinationFiles="@(_OutputFiles->'$(_TargetNugetFolder)\%(RecursiveDir)%(Filename)%(Extension)')" />
 		<Copy SourceFiles="@(_OutputFilesPDB)" DestinationFiles="@(_OutputFilesPDB->'$(_TargetNugetFolder)\%(RecursiveDir)%(Filename).pdb')" />
 	</Target>
+
+	<ItemGroup>
+		<None Include=".\..\Common\uno.png" Pack="true" PackagePath="\" Visible="false"/>
+	</ItemGroup>
 </Project>
diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Uno.UI.Runtime.Skia.Gtk.csproj b/src/Uno.UI.Runtime.Skia.Gtk/Uno.UI.Runtime.Skia.Gtk.csproj
@@ -10,7 +10,6 @@
 	<PropertyGroup>
 		<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
 		<Authors>nventive</Authors>
-		<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
 		<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
 		<PackageIcon>uno.png</PackageIcon>
 		<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
@@ -20,12 +19,12 @@
 		<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI.Runtime.Skia.Gtk</PackageId>
 
 		<RootNamespace>Uno.UI.Runtime.Skia</RootNamespace>
-	
+
 		<UseCommonOverridePackage>true</UseCommonOverridePackage>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<None Include="..\Common\uno.png" Pack="true" PackagePath="\" />
+		<None Include="..\Common\uno.png" Pack="true" PackagePath="\" Visible="false"/>
 	</ItemGroup>
 
 	<Import Project="..\Uno.CrossTargetting.props" />

diff --git a/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj b/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj
@@ -13,7 +13,6 @@
 		<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
 		<Authors>nventive</Authors>
 		<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
-		<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
 		<PackageIcon>uno.png</PackageIcon>
 		<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
 		<Description>This package provides the platform support for Skia / Linux framebuffer in Uno Platform projects.</Description>
@@ -24,7 +23,7 @@
 		<RootNamespace>Uno.WinUI.Runtime.Skia.Linux.FrameBuffer</RootNamespace>
 
 		<UseCommonOverridePackage>true</UseCommonOverridePackage>
-		
+
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 

diff --git a/src/Uno.UI.Runtime.Skia.Tizen/Uno.UI.Runtime.Skia.Tizen.csproj b/src/Uno.UI.Runtime.Skia.Tizen/Uno.UI.Runtime.Skia.Tizen.csproj
@@ -8,7 +8,6 @@
 		<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
 		<Authors>nventive</Authors>
 		<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
-		<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
 		<PackageIcon>uno.png</PackageIcon>
 		<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
 		<Description>This package provides the platform support for Skia in Uno Platform projects.</Description>
@@ -20,7 +19,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<None Include="..\Common\uno.png" Pack="true" PackagePath="\" />
+		<None Include="..\Common\uno.png" Pack="true" PackagePath="\" Visible="false" />
 	</ItemGroup>
 
 	<Import Project="..\Uno.CrossTargetting.props" />

diff --git a/src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj b/src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj
@@ -5,28 +5,27 @@
   </PropertyGroup>
 
 	<Import Project="../netcore-build-windows.props" />
-	
+
 	<PropertyGroup>
 		<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
 		<Authors>nventive</Authors>
 		<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
-		<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
 		<PackageIcon>uno.png</PackageIcon>
 		<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
 		<Description>This package provides the platform support for Skia in Uno Platform projects.</Description>
 		<Copyright>Copyright (C) 2015-2020 nventive inc. - all rights reserved</Copyright>
 
 		<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI.Runtime.Skia.Wpf</PackageId>
-	
+
 		<UseCommonOverridePackage>true</UseCommonOverridePackage>
 		<UseWPF>true</UseWPF>
 
 		<!-- 9.0 to work around a VS 2019 build issue -->
 		<LangVersion>9.0</LangVersion>
 	</PropertyGroup>
-	
+
 	<ItemGroup>
-		<None Include="..\Common\uno.png" Pack="true" PackagePath="\" />
+		<None Include="..\Common\uno.png" Pack="true" PackagePath="\" Visible="false" />
 	</ItemGroup>
 
 	<Import Project="..\Uno.CrossTargetting.props" />