Skip to content

Add xml comments. Centralize the dotnet target framework #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grendello merged 1 commit into from
Jun 3, 2024
Merged

Add xml comments. Centralize the dotnet target framework #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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