diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fc003f3..e6e4753d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,7 +78,7 @@ jobs: - name: Validate sample app run: | $msbuild = vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe - & $msbuild /r /bl:.\logs\samples.binlog samples\NewTemplate\Resizetizer.Extensions.Sample.sln /p:AotAssemblies=false /p:WasmShellILLinkerEnabled=false + & $msbuild /r /bl:.\logs\samples.binlog samples\NewTemplate\build.slnf /p:AotAssemblies=false /p:WasmShellILLinkerEnabled=false - name: Upload Artifacts uses: actions/upload-artifact@v2 diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets new file mode 100644 index 00000000..316f8455 --- /dev/null +++ b/samples/Directory.Build.targets @@ -0,0 +1,6 @@ + + + <_ResizetizerTargetsDirectory>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', 'src', '.nuspec')) + $(AfterMicrosoftNETSdkTargets);$(_ResizetizerTargetsDirectory)\Uno.Resizetizer.targets + + \ No newline at end of file diff --git a/samples/Legacy/Directory.build.targets b/samples/Legacy/Directory.build.targets deleted file mode 100644 index 4de98b5c..00000000 --- a/samples/Legacy/Directory.build.targets +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/samples/Legacy/Uno.Resizetizer.Sample/Uno.Resizetizer.Sample.Shared/Uno.Resizetizer.Sample.Shared.projitems b/samples/Legacy/Uno.Resizetizer.Sample/Uno.Resizetizer.Sample.Shared/Uno.Resizetizer.Sample.Shared.projitems index e5919200..73cf466c 100644 --- a/samples/Legacy/Uno.Resizetizer.Sample/Uno.Resizetizer.Sample.Shared/Uno.Resizetizer.Sample.Shared.projitems +++ b/samples/Legacy/Uno.Resizetizer.Sample/Uno.Resizetizer.Sample.Shared/Uno.Resizetizer.Sample.Shared.projitems @@ -1,8 +1,5 @@  - - $(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)..\..\..\..\src\.nuspec\Uno.Resizetizer.targets - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) true diff --git a/samples/NewTemplate/Directory.Build.props b/samples/NewTemplate/Directory.Build.props index 09c21bf1..cd82b9d5 100644 --- a/samples/NewTemplate/Directory.Build.props +++ b/samples/NewTemplate/Directory.Build.props @@ -57,8 +57,4 @@ - - - $(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)..\..\src\.nuspec\Uno.Resizetizer.targets - diff --git a/samples/NewTemplate/Directory.Build.targets b/samples/NewTemplate/Directory.Build.targets index 30332cf7..34b8a833 100644 --- a/samples/NewTemplate/Directory.Build.targets +++ b/samples/NewTemplate/Directory.Build.targets @@ -1,4 +1,5 @@ + diff --git a/samples/NewTemplate/build.slnf b/samples/NewTemplate/build.slnf new file mode 100644 index 00000000..0e4f6d5c --- /dev/null +++ b/samples/NewTemplate/build.slnf @@ -0,0 +1,14 @@ +{ + "solution": { + "path": "Resizetizer.Extensions.Sample.sln", + "projects": [ + "Resizetizer.Extensions.Sample.Mobile\\Resizetizer.Extensions.Sample.Mobile.csproj", + "Resizetizer.Extensions.Sample.Skia.Gtk\\Resizetizer.Extensions.Sample.Skia.Gtk.csproj", + "Resizetizer.Extensions.Sample.Skia.Linux.FrameBuffer\\Resizetizer.Extensions.Sample.Skia.Linux.FrameBuffer.csproj", + "Resizetizer.Extensions.Sample.Skia.WPF\\Resizetizer.Extensions.Sample.Skia.WPF.csproj", + "Resizetizer.Extensions.Sample.Wasm\\Resizetizer.Extensions.Sample.Wasm.csproj", + "Resizetizer.Extensions.Sample.Windows\\Resizetizer.Extensions.Sample.Windows.csproj", + "Resizetizer.Extensions.Sample\\Resizetizer.Extensions.Sample.csproj" + ] + } +} \ No newline at end of file diff --git a/src/.nuspec/Uno.Resizetizer.targets b/src/.nuspec/Uno.Resizetizer.targets index a209978d..970660ed 100644 --- a/src/.nuspec/Uno.Resizetizer.targets +++ b/src/.nuspec/Uno.Resizetizer.targets @@ -2,14 +2,14 @@ - - - - + + + + - <_UnoResizetizerTaskAssemblyName>$(MSBuildThisFileDirectory)Uno.Resizetizer_v0.dll + <_UnoResizetizerTaskAssemblyName>$(MSBuildThisFileDirectory)netstandard2.0\Uno.Resizetizer_v0.dll + Condition="'$(DesignTimeBuild)' != 'true' AND $(OutputType) == 'Exe'"> netstandard2.0 Uno.Resizetizer - true + true latest Debug;Release;DEBUG_RESIZETIZER + build + true + true 255.255.255.255 - - <_SkiaPackagePath>build\ - $(MSBuildThisFileDirectory)..\..\.nuspec\ + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', '..', '.nuspec')) en-US - - true Uno.Resizetizer_v0 - https://github.com/unoplatform/uno.resizetizer $(GITVERSION_SHA) Uno.Resizetizer Uno Platform package support for images. @@ -34,37 +32,73 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + - + + + - <_CopyItems Include="$(TargetDir)**\*.dll" Exclude="$(TargetDir)System.*.dll" /> - <_CopyItems Include="$(TargetDir)**\*.so" /> - <_CopyItems Include="$(TargetDir)**\*.pdb" /> - <_CopyItems Include="$(TargetDir)**\*.dylib" /> - <_CopyItems Include="$(TargetDir)**\*.pdb" /> + + - - + + + <_OutputFile Include="$(OutDir)\**\*.*" Exclude="$(OutDir)\**\*.targets"/> + <_RuntimeLibrary Include="@(RuntimeTargetsCopyLocalItems)" + OutputDirectory="$([MSBuild]::NormalizeDirectory('$(UnoNuspecDirectory)', '$(TargetFramework)\%(RuntimeTargetsCopyLocalItems.RuntimeIdentifier)'))" /> + + + + + + diff --git a/src/Resizetizer/src/ResizetizerPackages.projitems b/src/Resizetizer/src/ResizetizerPackages.projitems deleted file mode 100644 index 255bf864..00000000 --- a/src/Resizetizer/src/ResizetizerPackages.projitems +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ResizetizerFiles Include="$(PkgSystem_Memory)\lib\netstandard2.0\System.Memory.dll" /> - <_ResizetizerFiles Include="$(PkgSystem_Buffers)\lib\netstandard2.0\System.Buffers.dll" /> - <_ResizetizerFiles Include="$(PkgSystem_Text_Json)\lib\netstandard2.0\System.Text.Json.dll" /> - <_ResizetizerFiles Include="$(PkgSystem_Text_Encodings_Web)\lib\netstandard2.0\System.Text.Encodings.Web.dll" /> - <_ResizetizerFiles Include="$(PkgMicrosoft_Bcl_AsyncInterfaces)\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll" /> - <_ResizetizerFiles Include="$(PkgSystem_Numerics_Vectors)\lib\netstandard2.0\System.Numerics.Vectors.dll" /> - <_ResizetizerFiles Include="$(PkgSystem_Runtime_CompilerServices_Unsafe)\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll" /> - <_ResizetizerFiles Include="$(PkgSystem_ObjectModel)\lib\netstandard1.3\System.ObjectModel.dll" /> - <_ResizetizerFiles Include="$(PkgSvg_Custom)\lib\netstandard2.0\Svg.Custom.dll" /> - <_ResizetizerFiles Include="$(PkgSvg_Model)\lib\netstandard2.0\Svg.Model.dll" /> - <_ResizetizerFiles Include="$(PkgShimSkiaSharp)\lib\netstandard2.0\ShimSkiaSharp.dll" /> - <_ResizetizerFiles Include="$(PkgSvg_Skia)\lib\netstandard2.0\Svg.Skia.dll" /> - <_ResizetizerFiles Include="$(PkgFizzler)\lib\netstandard2.0\Fizzler.dll" /> - <_ResizetizerFiles Include="$(PkgSystem_IO_UnmanagedMemoryStream)\lib\netstandard1.3\System.IO.UnmanagedMemoryStream.dll" /> - <_ResizetizerFiles Include="$(PkgExCSS)\lib\netstandard2.0\ExCSS.dll" /> - <_ResizetizerFiles Include="$(PkgSkiaSharp)\lib\net462\SkiaSharp.dll" /> - <_ResizetizerFiles Include="$(PkgSkiaSharp)\lib\net462\SkiaSharp.pdb" /> - <_ResizetizerFiles Include="$(PkgSkiaSharp_NativeAssets_macOS)\runtimes\osx\native\libSkiaSharp.dylib" /> - <_ResizetizerFiles Include="$(PkgSkiaSharp_NativeAssets_Win32)\runtimes\win-x86\native\libSkiaSharp.dll" Link="x86\libSkiaSharp.dll" Arch="x86/" /> - <_ResizetizerFiles Include="$(PkgSkiaSharp_NativeAssets_Win32)\runtimes\win-x64\native\libSkiaSharp.dll" Link="x64\libSkiaSharp.dll" Arch="x64/" /> - <_ResizetizerFiles Include="$(PkgSkiaSharp_NativeAssets_Win32)\runtimes\win-arm64\native\libSkiaSharp.dll" Link="arm64\libSkiaSharp.dll" Arch="arm64/" /> - <_ResizetizerFiles Include="$(PkgSkiaSharp_NativeAssets_Linux_NoDependencies)\runtimes\linux-arm\native\libSkiaSharp.so" Link="arm\libSkiaSharp.so" Arch="arm/" /> - <_ResizetizerFiles Include="$(PkgSkiaSharp_NativeAssets_Linux_NoDependencies)\runtimes\linux-arm64\native\libSkiaSharp.so" Link="arm64\libSkiaSharp.so" Arch="arm64/" /> - <_ResizetizerFiles Include="$(PkgSkiaSharp_NativeAssets_Linux_NoDependencies)\runtimes\linux-musl-x64\native\libSkiaSharp.so" Link="musl-x64\libSkiaSharp.so" Arch="musl-x64/" /> - <_ResizetizerFiles Include="$(PkgSkiaSharp_NativeAssets_Linux_NoDependencies)\runtimes\linux-x64\native\libSkiaSharp.so" Link="x64\libSkiaSharp.so" Arch="x64/" /> - <_ResizetizerFiles Include="$(PkgSkiaSharp_HarfBuzz)\lib\net462\SkiaSharp.HarfBuzz.dll" /> - <_ResizetizerFiles Include="$(PkgSkiaSharp_HarfBuzz)\lib\net462\SkiaSharp.HarfBuzz.pdb" /> - <_ResizetizerFiles Include="$(PkgHarfBuzzSharp)\lib\net462\HarfBuzzSharp.dll" /> - <_ResizetizerFiles Include="$(PkgHarfBuzzSharp)\lib\net462\HarfBuzzSharp.pdb" /> - <_ResizetizerFiles Include="$(PkgHarfBuzzSharp_NativeAssets_macOS)\runtimes\osx\native\libHarfBuzzSharp.dylib" /> - <_ResizetizerFiles Include="$(PkgHarfBuzzSharp_NativeAssets_Win32)\runtimes\win-x86\native\libHarfBuzzSharp.dll" Link="x86\libHarfBuzzSharp.dll" Arch="x86/" /> - <_ResizetizerFiles Include="$(PkgHarfBuzzSharp_NativeAssets_Win32)\runtimes\win-x64\native\libHarfBuzzSharp.dll" Link="x64\libHarfBuzzSharp.dll" Arch="x64/" /> - <_ResizetizerFiles Include="$(PkgHarfBuzzSharp_NativeAssets_Win32)\runtimes\win-arm64\native\libHarfBuzzSharp.dll" Link="arm64\libHarfBuzzSharp.dll" Arch="arm64/" /> - <_ResizetizerFiles Include="$(PkgHarfBuzzSharp_NativeAssets_Linux)\runtimes\linux-arm\native\libHarfBuzzSharp.so" Link="arm\libHarfBuzzSharp.so" Arch="arm/" /> - <_ResizetizerFiles Include="$(PkgHarfBuzzSharp_NativeAssets_Linux)\runtimes\linux-arm64\native\libHarfBuzzSharp.so" Link="arm64\libHarfBuzzSharp.so" Arch="arm64/" /> - <_ResizetizerFiles Include="$(PkgHarfBuzzSharp_NativeAssets_Linux)\runtimes\linux-musl-x64\native\libHarfBuzzSharp.so" Link="musl-x64\libHarfBuzzSharp.so" Arch="musl-x64/" /> - <_ResizetizerFiles Include="$(PkgHarfBuzzSharp_NativeAssets_Linux)\runtimes\linux-x64\native\libHarfBuzzSharp.so" Link="x64\libHarfBuzzSharp.so" Arch="x64/" /> - - - diff --git a/src/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj b/src/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj index 17fee812..a7bd72a0 100644 --- a/src/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj +++ b/src/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj @@ -13,7 +13,7 @@ - + @@ -21,7 +21,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - +