Skip to content
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

#307 Migrate to PackageReference; NuGet updates; Target .NET 4.8; Fix … #308

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#307 Migrate to PackageReference; NuGet updates; Target .NET 4.8; Fix … #308

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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,4 @@ ModelManifest.xml
/*.rb
/*.bat
/tools/XmlGenerator/*.sqlite
/tools/XmlGenerator/sqlite-latest.sqlite.bz2
244 changes: 228 additions & 16 deletions src/EVEMon.Common/App.config
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/EVEMon.Common/CloudStorageServices/CloudStorageServiceResources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/EVEMon.Common/CloudStorageServices/CloudStorageServiceSettings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...EVEMon.Common/CloudStorageServices/Dropbox/DropboxCloudStorageServiceSettings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ommon/CloudStorageServices/GoogleDrive/GoogleDriveCloudStorageServiceSettings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...EMon.Common/CloudStorageServices/OneDrive/OneDriveCloudStorageServiceSettings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/EVEMon.Common/Constants/NetworkConstants1.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

148 changes: 45 additions & 103 deletions src/EVEMon.Common/EVEMon.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>EVEMon.Common</RootNamespace>
<AssemblyName>EVEMon.Common</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
Expand Down Expand Up @@ -58,90 +58,8 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dropbox.Api, Version=4.0.0.0, Culture=neutral, PublicKeyToken=310f0e82fbb45d01, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dropbox.Api.4.9.4\lib\net45\Dropbox.Api.dll</HintPath>
</Reference>
<Reference Include="Google.Apis, Version=1.42.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\..\packages\Google.Apis.1.42.0\lib\net45\Google.Apis.dll</HintPath>
</Reference>
<Reference Include="Google.Apis.Auth, Version=1.42.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\..\packages\Google.Apis.Auth.1.42.0\lib\net45\Google.Apis.Auth.dll</HintPath>
</Reference>
<Reference Include="Google.Apis.Auth.PlatformServices, Version=1.42.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\..\packages\Google.Apis.Auth.1.42.0\lib\net45\Google.Apis.Auth.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="Google.Apis.Calendar.v3, Version=1.42.0.1795, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\..\packages\Google.Apis.Calendar.v3.1.42.0.1795\lib\net45\Google.Apis.Calendar.v3.dll</HintPath>
</Reference>
<Reference Include="Google.Apis.Core, Version=1.42.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\..\packages\Google.Apis.Core.1.42.0\lib\net45\Google.Apis.Core.dll</HintPath>
</Reference>
<Reference Include="Google.Apis.Drive.v3, Version=1.42.0.1778, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\..\packages\Google.Apis.Drive.v3.1.42.0.1778\lib\net45\Google.Apis.Drive.v3.dll</HintPath>
</Reference>
<Reference Include="Google.Apis.PlatformServices, Version=1.42.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\..\packages\Google.Apis.1.42.0\lib\net45\Google.Apis.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.IdentityModel.JsonWebTokens.5.6.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Logging, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.6.0\lib\net461\Microsoft.IdentityModel.Logging.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Tokens, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
</Reference>
<Reference Include="Nancy, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Nancy.2.0.0\lib\net452\Nancy.dll</HintPath>
</Reference>
<Reference Include="NetOffice, Version=1.7.3.0, Culture=neutral, PublicKeyToken=297f57b43ae7c1de, processorArchitecture=MSIL">
<HintPath>..\..\packages\NetOffice.Core.Net40.1.7.4.4\lib\net40\NetOffice.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OfficeApi, Version=1.7.3.0, Culture=neutral, PublicKeyToken=a39beb0835c43c8e, processorArchitecture=MSIL">
<HintPath>..\..\packages\NetOffice.Core.Net40.1.7.4.4\lib\net40\OfficeApi.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="OneDriveSdk, Version=1.1.29.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.OneDriveSDK.1.1.29\lib\net451\OneDriveSdk.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OneDriveSdk.WindowsForms, Version=1.1.29.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.OneDriveSDK.1.1.29\lib\net451\OneDriveSdk.WindowsForms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OutlookApi, Version=1.7.3.0, Culture=neutral, PublicKeyToken=b118031aaa1097f3, processorArchitecture=MSIL">
<HintPath>..\..\packages\NetOffice.Outlook.Net40.1.7.4.4\lib\net40\OutlookApi.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.6.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System" />
Expand All @@ -152,18 +70,7 @@
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="VBIDEApi, Version=1.7.3.0, Culture=neutral, PublicKeyToken=931cec8882205047, processorArchitecture=MSIL">
<HintPath>..\..\packages\NetOffice.Core.Net40.1.7.4.4\lib\net40\VBIDEApi.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="YamlDotNet, Version=8.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
<HintPath>..\..\packages\YamlDotNet.8.0.0\lib\net45\YamlDotNet.dll</HintPath>
</Reference>
<Reference Include="Zlib.Portable, Version=1.11.0.0, Culture=neutral, PublicKeyToken=431cba815f6a8b5b, processorArchitecture=MSIL">
<HintPath>..\..\packages\Zlib.Portable.Signed.1.11.0\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\SharedAssemblyInfo.cs">
Expand Down Expand Up @@ -844,7 +751,6 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>OneDriveCloudStorageServiceSettings.Designer.cs</LastGenOutput>
</None>
<None Include="packages.config" />
<Compile Include="Models\BuyOrder.cs" />
<Compile Include="Data\Datafile.cs" />
<Compile Include="Models\APIProvider.cs" />
Expand Down Expand Up @@ -1311,7 +1217,50 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<PackageReference Include="Dropbox.Api">
<Version>6.19.0</Version>
</PackageReference>
<PackageReference Include="Google.Apis.Calendar.v3">
<Version>1.55.0.2500</Version>
</PackageReference>
<PackageReference Include="Google.Apis.Drive.v3">
<Version>1.55.0.2502</Version>
</PackageReference>
<PackageReference Include="Microsoft.Bcl.Async">
<Version>1.0.168</Version>
</PackageReference>
<PackageReference Include="Microsoft.Bcl.Build">
<Version>1.0.21</Version>
</PackageReference>
<PackageReference Include="Microsoft.Net.Http">
<Version>2.2.29</Version>
</PackageReference>
<PackageReference Include="Microsoft.OneDriveSDK">
<Version>1.1.29</Version>
</PackageReference>
<PackageReference Include="Nancy">
<Version>2.0.0</Version>
</PackageReference>
<PackageReference Include="NetOffice.Outlook.Net40">
<Version>1.7.4.11</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>13.0.1</Version>
</PackageReference>
<PackageReference Include="SharpZipLib">
<Version>1.3.3</Version>
</PackageReference>
<PackageReference Include="System.IdentityModel.Tokens.Jwt">
<Version>6.14.1</Version>
</PackageReference>
<PackageReference Include="YamlDotNet">
<Version>11.2.1</Version>
</PackageReference>
<PackageReference Include="Zlib.Portable.Signed">
<Version>1.11.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<None Include="Resources\callback_ok.htm" />
<None Include="Resources\callback_fail.htm" />
Expand All @@ -1332,11 +1281,4 @@
</Target>
<Target Name="AfterBuild" DependsOnTargets="GenerateSerializationAssembliesForAllTypes">
</Target>
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<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\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion src/EVEMon.Common/Net/ExceptionMessages.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/EVEMon.Common/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions src/EVEMon.Common/Resources/MD5Sums.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
df91ac86ac9954dfaff13ab77681a1cc *eve-blueprints-en-US.xml.gzip
8b36cd05b77d53ac9306c847dcf3c2ff *eve-blueprints-en-US.xml.gzip
540000f7c111354769a54fa31e57d411 *eve-certificates-en-US.xml.gzip
3077e700023d84a267b744a6ee44acc7 *eve-geography-en-US.xml.gzip
4c9cb667e22421fad8ca08777be7fd8a *eve-items-en-US.xml.gzip
e4075d02fc59996779c3892ef88e74ab *eve-geography-en-US.xml.gzip
3c5918aa1550583193697e6289c7aa50 *eve-items-en-US.xml.gzip
3668b50996fc40a0c0853fec427b5712 *eve-masteries-en-US.xml.gzip
1f6ae9f613fd26b08d5ec206d0958d79 *eve-properties-en-US.xml.gzip
adb83f4fc55f61a58548dcb924a91cfe *eve-reprocessing-en-US.xml.gzip
727a781211b138cf331afed346692962 *eve-skills-en-US.xml.gzip
fc04c1431cd200d3a7fc7f4f0c50ac3f *eve-properties-en-US.xml.gzip
617e104b832b9206f251482943fe77ba *eve-reprocessing-en-US.xml.gzip
e527bbfbb4b2fbeab7c86770f7ed1a19 *eve-skills-en-US.xml.gzip
2 changes: 1 addition & 1 deletion src/EVEMon.Common/Resources/Skill_Select/IconSettings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified src/EVEMon.Common/Resources/eve-blueprints-en-US.xml.gzip
View file
Open in desktop
Binary file not shown.
Binary file modified src/EVEMon.Common/Resources/eve-geography-en-US.xml.gzip
View file
Open in desktop
Binary file not shown.
Binary file modified src/EVEMon.Common/Resources/eve-items-en-US.xml.gzip
View file
Open in desktop
Binary file not shown.
Binary file modified src/EVEMon.Common/Resources/eve-properties-en-US.xml.gzip
View file
Open in desktop
Binary file not shown.
Binary file modified src/EVEMon.Common/Resources/eve-reprocessing-en-US.xml.gzip
View file
Open in desktop
Binary file not shown.
Binary file modified src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip
View file
Open in desktop
Binary file not shown.
Loading