diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets index 316f8455..9b1979e8 100644 --- a/samples/Directory.Build.targets +++ b/samples/Directory.Build.targets @@ -1,6 +1,24 @@ - - <_ResizetizerTargetsDirectory>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', 'src', '.nuspec')) - $(AfterMicrosoftNETSdkTargets);$(_ResizetizerTargetsDirectory)\Uno.Resizetizer.targets - + + + + + + + + + + <_LocalPackage Include="$(MSBuildThisFileDirectory)packages\Uno.Resizetizer.*.nupkg" /> + + + + <_LocalPackageVersion>$([System.Text.RegularExpressions.Regex]::Replace(%(_LocalPackage.Filename), '^(Uno\.Resizetizer\.)', '')) + + + + + + \ No newline at end of file diff --git a/samples/nuget.config b/samples/nuget.config new file mode 100644 index 00000000..224004db --- /dev/null +++ b/samples/nuget.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/.nuspec/Uno.Resizetizer.targets b/src/.nuspec/Uno.Resizetizer.targets index 970660ed..7f68d35d 100644 --- a/src/.nuspec/Uno.Resizetizer.targets +++ b/src/.nuspec/Uno.Resizetizer.targets @@ -536,4 +536,36 @@ + + + + <_ResizetizerRuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier) + + <_ResizetizerRuntimeIdentifier Condition=" $(_ResizetizerRuntimeIdentifier.Contains('osx')) ">osx + <_ResizetizerRuntimeIdentifierDirectory>$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', 'netstandard2.0', 'runtimes', '$(_ResizetizerRuntimeIdentifier)')) + <_ResizetizerRuntimeAssetsOutput>$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', 'netstandard2.0')) + + + + <_ResiztizerRuntimeAssets Include="$(_ResizetizerRuntimeIdentifierDirectory)\**\*" + OutputDirectory="$(_ResizetizerRuntimeAssetsOutput)" /> + + + + + + + + + + diff --git a/src/Resizetizer/src/Resizetizer.csproj b/src/Resizetizer/src/Resizetizer.csproj index 24100fa8..d91bd282 100644 --- a/src/Resizetizer/src/Resizetizer.csproj +++ b/src/Resizetizer/src/Resizetizer.csproj @@ -13,7 +13,11 @@ 255.255.255.255 $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', '..', '.nuspec')) + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', '..', '..', 'samples', 'packages')) en-US + + + true @@ -24,10 +28,6 @@ README.md - - true - - @@ -74,38 +74,49 @@ + <_RuntimeAssets Include="@(RuntimeTargetsCopyLocalItems)" + DestinationSubDirectory="%(RuntimeTargetsCopyLocalItems.DestinationSubDirectory)" + OutputDirectory="$([System.Text.RegularExpressions.Regex]::Replace(%(RuntimeTargetsCopyLocalItems.RuntimeIdentifier), '^(linux|win)-', ''))" Condition="%(RuntimeTargetsCopyLocalItems.RuntimeIdentifier) != 'win' AND %(RuntimeTargetsCopyLocalItems.RuntimeIdentifier) != 'unix'" /> + - + - + + + + + + + + - <_OutputFile Include="$(OutDir)\**\*.*" Exclude="$(OutDir)\**\*.targets"/> + + - - - - + + +