diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index bbfb1bc011..79eb91ddee 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -92,13 +92,13 @@ $(MSBuildProjectDirectory)\$(IntermediateOutputPath)\PackGenerators\ + Properties="Configuration=$(Configuration);OutputPath=$(GeneratorOutputPath);TargetFramework=netstandard2.0" /> - + diff --git a/src/Uno.CrossTargeting.props b/src/Uno.CrossTargeting.props index af452143b2..863e4695ae 100644 --- a/src/Uno.CrossTargeting.props +++ b/src/Uno.CrossTargeting.props @@ -6,13 +6,13 @@ - + <_TargetNugetPackageId Condition="'$(PackageId)'!=''">$(PackageId) <_TargetNugetPackageId Condition="'$(PackageId)'==''">$(AssemblyName) - <_TargetNugetFolder Condition="'$(ToolOfPackage)'!=''">$(USERPROFILE)\.nuget\packages\$(ToolOfPackage)\$(UnoNugetOverrideVersion)\analyzers\dotnet\cs - <_TargetNugetFolder Condition="'$(ToolOfPackage)'==''">$(USERPROFILE)\.nuget\packages\$(_TargetNugetPackageId)\$(UnoNugetOverrideVersion)\lib\$(TargetFramework) + <_TargetNugetFolder Condition="'$(ToolOfPackage)'!=''">$(USERPROFILE)\.nuget\packages\$(ToolOfPackage)\$(NugetOverrideVersion)\analyzers\dotnet\cs + <_TargetNugetFolder Condition="'$(ToolOfPackage)'==''">$(USERPROFILE)\.nuget\packages\$(_TargetNugetPackageId)\$(NugetOverrideVersion)\lib\$(TargetFramework) diff --git a/src/Uno.Extensions.Logging/HostBuilderExtensions.cs b/src/Uno.Extensions.Logging/HostBuilderExtensions.cs index 68f9874560..ff12b5c656 100644 --- a/src/Uno.Extensions.Logging/HostBuilderExtensions.cs +++ b/src/Uno.Extensions.Logging/HostBuilderExtensions.cs @@ -23,14 +23,14 @@ public static IHostBuilder UseLogging( #if !__WASM__ #if __IOS__ #pragma warning disable CA1416 // Validate platform compatibility: The net6.0 version is not used on older versions of OS - builder.AddProvider(new global::Uno.Extensions.Logging.OSLogLoggerProvider()); + builder.AddProvider(new global::Uno.Extensions.Logging.OSLogLoggerProvider()); #pragma warning restore CA1416 // Validate platform compatibility -#elif NET6_0_OR_GREATER // Console isn't supported on all Xamarin targets, so only adding for net6.0 and above - builder.AddConsole(); +#elif NET6_0_OR_GREATER || __SKIA__ // Console isn't supported on all Xamarin targets, so only adding for net6.0 and above + builder.AddConsole(); #endif builder.AddDebug(); #elif __WASM__ - builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider()); + builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider()); #endif } diff --git a/src/crosstargeting_override.props.sample b/src/crosstargeting_override.props.sample index a9a2f6e4dd..cd4180c5c1 100644 --- a/src/crosstargeting_override.props.sample +++ b/src/crosstargeting_override.props.sample @@ -26,7 +26,18 @@ The UnoTargetFrameworkMobileOverride property is use only in Mobile (i.e. the single-project used by net6-ios/android/mac/catalyst) --> - net6.0-ios - $(UnoTargetFrameworkMobileOverride);netstandard2.0 + + + + + +