Skip to content

Commit

Permalink
Add xml comments. Centralize the dotnet target framework (#143)
Browse files Browse the repository at this point in the history
  • Loading branch information
dellis1972 authored Jun 3, 2024
1 parent b541b87 commit de57dcc
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$(MSBuildThisFileDirectory)..\LibZipSharp.props" />

<PropertyGroup>
<TargetFrameworks>net471;net7.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net471;$(_DotNetTargetFramework);netcoreapp3.1</TargetFrameworks>

<IsPackable>false</IsPackable>
<LibZipSharpBundleAllNativeLibraries>true</LibZipSharpBundleAllNativeLibraries>
Expand Down
1 change: 1 addition & 0 deletions LibZipSharp.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<_LibZipSharpAssemblyVersion>$(_LibZipSharpAssemblyVersionMajor).$(_LibZipSharpAssemblyVersionMinor).$(_LibZipSharpAssemblyVersionPatch)</_LibZipSharpAssemblyVersion>
<_NativeLibraryVersionForName>$(_LibZipSharpAssemblyVersionMajor)-$(_LibZipSharpAssemblyVersionMinor)</_NativeLibraryVersionForName>
<_NativeLibraryBaseName>libZipSharpNative-$(_NativeLibraryVersionForName)</_NativeLibraryBaseName>
<_DotNetTargetFramework>net7.0</_DotNetTargetFramework>

<!--
Nuget Version. You can append things like -alpha-1 etc to this value.
Expand Down
3 changes: 2 additions & 1 deletion LibZipSharp/Xamarin.Tools.Zip/ZipArchive.cs
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ ErrorCode Open (string path, OpenFlags flags)
/// </summary>
/// <param name="stream">The stream to open</param>
/// <param name="options">Platform-specific options</param>
/// <param name="strictConsistencyChecks"></param>
/// <param name="strictConsistencyChecks">Perform strict consistency checks.</param>
public static ZipArchive Open (Stream stream, IPlatformOptions options = null, bool strictConsistencyChecks = false)
{
OpenFlags flags = OpenFlags.None;
Expand All @@ -210,6 +210,7 @@ public static ZipArchive Open (Stream stream, IPlatformOptions options = null, b
/// </summary>
/// <param name="stream">The stream to create the arhive in</param>
/// <param name="options">Platform-specific options</param>
/// <param name="strictConsistencyChecks">Perform strict consistency checks.</param>
public static ZipArchive Create (Stream stream, IPlatformOptions options = null, bool strictConsistencyChecks = false)
{
OpenFlags flags = OpenFlags.Create | OpenFlags.Truncate;
Expand Down
4 changes: 2 additions & 2 deletions LibZipSharp/libZipSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<AssemblyName>libZipSharp</AssemblyName>
<AssemblyTitle>libZipSharp</AssemblyTitle>
<TargetFrameworks>net7.0;netstandard2.0;net45;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>$(_DotNetTargetFramework);netstandard2.0;net45;netcoreapp3.1</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<RootNamespace>Xamarin.Tools.Zip</RootNamespace>
Expand Down Expand Up @@ -46,7 +46,7 @@
<Import Project="libZipSharp.targets" />

<ItemGroup>
<None Include="$(IntermediateOutputPath)/net7.0/$(XamarinLibZipSharpTargetsName)" PackagePath="build" Pack="true" />
<None Include="$(IntermediateOutputPath)/$(_DotNetTargetFramework)/$(XamarinLibZipSharpTargetsName)" PackagePath="build" Pack="true" />
<None Include="$(_NativeBuildDir)\lib\Darwin\$(_NativeLibraryBaseName).dylib" PackagePath="runtimes\osx\native\$(_NativeLibraryBaseName).dylib" Pack="true" />
<None Include="$(_NativeBuildDir)\lib\win64\$(_NativeLibraryBaseName).dll" PackagePath="runtimes\win-x64\native\$(_NativeLibraryBaseName).dll" Pack="true" />
<None Include="$(_NativeBuildDir)\lib\win64\$(_NativeLibraryBaseName).pdb" PackagePath="runtimes\win-x64\native\$(_NativeLibraryBaseName).pdb" Pack="true" />
Expand Down

0 comments on commit de57dcc

Please sign in to comment.