Skip to content

Commit

Permalink
Merge pull request #2 from Yortw/fix/update-dependencies
Browse files Browse the repository at this point in the history
Fix/update dependencies
  • Loading branch information
Yortw authored Sep 15, 2022
2 parents 51e0d4f + 7552517 commit e5f7f73
Show file tree
Hide file tree
Showing 14 changed files with 38 additions and 37 deletions.
4 changes: 2 additions & 2 deletions Src/Net45/Yort.Eftpos.Verifone.PosLink.Net45.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<Reference Include="Ladon, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Ladon.Net.1.0.2\lib\net40\Ladon.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.2\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
<Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.4.0\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion Src/Net45/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Ladon.Net" version="1.0.2" targetFramework="net40" />
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.2" targetFramework="net45" />
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.4.0" targetFramework="net45" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<ItemGroup>
<PackageReference Include="Ladon.Net" Version="1.0.2" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="1.2.2" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="1.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Src/PublishNugetPackage.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@echo off
echo Press any key to publish
pause
".nuget\NuGet.exe" push Yort.Eftpos.Verifone.PosLink.1.0.0.nupkg -Source https://www.nuget.org/api/v2/package
".nuget\NuGet.exe" push Yort.Eftpos.Verifone.PosLink.1.0.2.nupkg -Source https://www.nuget.org/api/v2/package
pause
2 changes: 1 addition & 1 deletion Src/PublishWinFormsNugetPackage.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@echo off
echo Press any key to publish
pause
".nuget\NuGet.exe" push Yort.Eftpos.Verifone.PosLink.WinForms.1.0.0.nupkg -Source https://www.nuget.org/api/v2/package
".nuget\NuGet.exe" push Yort.Eftpos.Verifone.PosLink.WinForms.1.0.2.nupkg -Source https://www.nuget.org/api/v2/package
pause
4 changes: 2 additions & 2 deletions Src/Shared/AssemblyInfoCommon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.2.0")]
[assembly: AssemblyFileVersion("1.0.2.0")]
[assembly: ComVisible(false)]
4 changes: 2 additions & 2 deletions Src/Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
[assembly: Guid("b70be382-c5a6-4af0-a8e3-9d73c5bd2995")]

// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.2.0")]
[assembly: AssemblyFileVersion("1.0.2.0")]
18 changes: 9 additions & 9 deletions Src/Tests/Yort.Eftpos.Verifone.PosLink.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.1.1.12\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.12\build\net45\MSTest.TestAdapter.props')" />
<Import Project="..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Yort.Eftpos.Verifone.PosLink.Tests</RootNamespace>
<AssemblyName>Yort.Eftpos.Verifone.PosLink.Tests</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
Expand Down Expand Up @@ -42,14 +42,14 @@
<Reference Include="Ladon, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Ladon.Net.1.0.2\lib\net40\Ladon.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.2\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
<Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.4.0\lib\net46\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.1.11\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
<HintPath>..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.1.11\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
<HintPath>..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -79,8 +79,8 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.12\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.12\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.12\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.12\build\net45\MSTest.TestAdapter.targets'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets'))" />
</Target>
<Import Project="..\packages\MSTest.TestAdapter.1.1.12\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.12\build\net45\MSTest.TestAdapter.targets')" />
<Import Project="..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets')" />
</Project>
6 changes: 3 additions & 3 deletions Src/Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Ladon.Net" version="1.0.2" targetFramework="net471" />
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.2" targetFramework="net471" />
<package id="MSTest.TestAdapter" version="1.1.12" targetFramework="net471" />
<package id="MSTest.TestFramework" version="1.1.11" targetFramework="net471" />
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.4.0" targetFramework="net48" />
<package id="MSTest.TestAdapter" version="2.2.10" targetFramework="net48" />
<package id="MSTest.TestFramework" version="2.2.10" targetFramework="net48" />
</packages>
4 changes: 2 additions & 2 deletions Src/Uwp/Yort.Eftpos.Verifone.PosLink.Uwp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@
<Version>1.0.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream">
<Version>1.2.2</Version>
<Version>1.4.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.7</Version>
<Version>6.2.14</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Src/WinForms/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
4 changes: 2 additions & 2 deletions Src/Yort.Eftpos.Verifone.PosLink.WinForms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Yort.Eftpos.Verifone.PosLink.WinForms</id>
<version>1.0.0</version>
<version>1.0.2</version>
<title>Yort.Eftpos.Verifone.PosLink.WinForms</title>
<authors>Troy Willmot</authors>
<owners>Yortw</owners>
Expand All @@ -11,7 +11,7 @@
<iconUrl>https://raw.githubusercontent.com/Yortw/Yort.Eftpos.Verifone.PosLink/master/Icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>A basic WinForms UI implementation for integration with the Yort.Eftpos.Verifone.PosLink package.</description>
<releaseNotes>Initial release.</releaseNotes>
<releaseNotes>Updated to newer dependencies.</releaseNotes>
<copyright>Copyright 2018</copyright>
<language>en-NZ</language>
<tags>eftpos poslink verifone payments nz newzealand netstandard20 uwp</tags>
Expand Down
4 changes: 2 additions & 2 deletions Src/Yort.Eftpos.Verifone.PosLink.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Yort.Eftpos.Verifone.PosLink</id>
<version>1.0.0</version>
<version>1.0.2</version>
<title>Yort.Eftpos.Verifone.PosLink</title>
<authors>Troy Willmot</authors>
<owners>Yortw</owners>
Expand All @@ -12,7 +12,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>An unofficial .Net implementation of the Verifone PosLink protocol for EFTPOS pinpads.</description>
<summary>A 100% .Net (unofficial) implementation of the Verifone PosLink protocol for EFTPOS pinpads for performing POS EFTPOS transactions in NZ (and anywhere else supporting the same protocol).</summary>
<releaseNotes>Initial release.</releaseNotes>
<releaseNotes>Updated some dependencies to newer versions.</releaseNotes>
<copyright>Copyright 2018</copyright>
<language>en-NZ</language>
<tags>eftpos poslink verifone payments nz newzealand netstandard20 uwp</tags>
Expand Down
15 changes: 8 additions & 7 deletions Src/Yort.Eftpos.Verifone.PosLink.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2036
# Visual Studio Version 17
VisualStudioVersion = 17.3.32901.215
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yort.Eftpos.Verifone.PosLink.NetStandard20", "NetStandard20\Yort.Eftpos.Verifone.PosLink.NetStandard20.csproj", "{A93DFFD3-1155-45B1-A546-CD6C579CFBC9}"
EndProject
Expand All @@ -21,11 +21,6 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yort.Eftpos.Verifone.PosLink.WinForms", "WinForms\Yort.Eftpos.Verifone.PosLink.WinForms.csproj", "{BE5AA007-4C29-4269-A5C1-7BD68E48ADE3}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Shared\Yort.Eftpos.Verifone.PosLink.Shared.projitems*{6c342b19-752e-4092-b067-afe6248f208f}*SharedItemsImports = 13
Shared\Yort.Eftpos.Verifone.PosLink.Shared.projitems*{896502da-e348-4a5f-91f9-472813637508}*SharedItemsImports = 4
Shared\Yort.Eftpos.Verifone.PosLink.Shared.projitems*{cf2fce24-fab0-4e6b-8dc7-89098da5c71e}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
Ad-Hoc|ARM = Ad-Hoc|ARM
Expand Down Expand Up @@ -300,4 +295,10 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0736E929-99E1-4863-9A9E-1E155863A566}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Shared\Yort.Eftpos.Verifone.PosLink.Shared.projitems*{6c342b19-752e-4092-b067-afe6248f208f}*SharedItemsImports = 13
Shared\Yort.Eftpos.Verifone.PosLink.Shared.projitems*{896502da-e348-4a5f-91f9-472813637508}*SharedItemsImports = 4
Shared\Yort.Eftpos.Verifone.PosLink.Shared.projitems*{a93dffd3-1155-45b1-a546-cd6c579cfbc9}*SharedItemsImports = 5
Shared\Yort.Eftpos.Verifone.PosLink.Shared.projitems*{cf2fce24-fab0-4e6b-8dc7-89098da5c71e}*SharedItemsImports = 4
EndGlobalSection
EndGlobal

0 comments on commit e5f7f73

Please sign in to comment.