Skip to content
This repository has been archived by the owner on Jun 7, 2024. It is now read-only.

Commit

Permalink
Merge pull request #40 from goshippo/fix-project-build
Browse files Browse the repository at this point in the history
Creating a up-to-date project for visual studio package generation
  • Loading branch information
assislucas authored Sep 7, 2018
2 parents d5658b1 + af548e1 commit bc85f10
Show file tree
Hide file tree
Showing 14 changed files with 116 additions and 9,523 deletions.
80 changes: 17 additions & 63 deletions Shippo.sln
Original file line number Diff line number Diff line change
@@ -1,77 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shippo", "Shippo\Shippo.csproj", "{218CF4C2-C457-43E4-9D1B-0880D10181FF}"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28010.2019
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shippo", "Shippo\Shippo.csproj", "{6816FD58-3FC6-4EFC-95F8-D11E9C1D387F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShippoExample", "ShippoExample\ShippoExample.csproj", "{8E81B2FD-1F8C-4C8C-B5B5-B8600709E505}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShippoTesting", "ShippoTesting\ShippoTesting.csproj", "{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShippoExample", "ShippoExample\ShippoExample.csproj", "{7712EC9C-2581-49EE-8B61-745843F2CD6F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{218CF4C2-C457-43E4-9D1B-0880D10181FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{218CF4C2-C457-43E4-9D1B-0880D10181FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{218CF4C2-C457-43E4-9D1B-0880D10181FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{218CF4C2-C457-43E4-9D1B-0880D10181FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{218CF4C2-C457-43E4-9D1B-0880D10181FF}.Debug|x86.ActiveCfg = Debug|Any CPU
{218CF4C2-C457-43E4-9D1B-0880D10181FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{218CF4C2-C457-43E4-9D1B-0880D10181FF}.Release|Any CPU.Build.0 = Release|Any CPU
{218CF4C2-C457-43E4-9D1B-0880D10181FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{218CF4C2-C457-43E4-9D1B-0880D10181FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{218CF4C2-C457-43E4-9D1B-0880D10181FF}.Release|x86.ActiveCfg = Release|Any CPU
{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}.Debug|x86.ActiveCfg = Debug|Any CPU
{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}.Debug|x86.Build.0 = Debug|Any CPU
{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}.Release|Any CPU.Build.0 = Release|Any CPU
{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}.Release|x86.ActiveCfg = Release|Any CPU
{4AF39DE0-2FA9-43D1-9254-CF8546FF22C8}.Release|x86.Build.0 = Release|Any CPU
{8E81B2FD-1F8C-4C8C-B5B5-B8600709E505}.Debug|Any CPU.ActiveCfg = Debug|x86
{8E81B2FD-1F8C-4C8C-B5B5-B8600709E505}.Debug|Any CPU.Build.0 = Debug|x86
{8E81B2FD-1F8C-4C8C-B5B5-B8600709E505}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{8E81B2FD-1F8C-4C8C-B5B5-B8600709E505}.Debug|Mixed Platforms.Build.0 = Debug|x86
{8E81B2FD-1F8C-4C8C-B5B5-B8600709E505}.Debug|x86.ActiveCfg = Debug|x86
{8E81B2FD-1F8C-4C8C-B5B5-B8600709E505}.Debug|x86.Build.0 = Debug|x86
{8E81B2FD-1F8C-4C8C-B5B5-B8600709E505}.Release|Any CPU.ActiveCfg = Release|x86
{8E81B2FD-1F8C-4C8C-B5B5-B8600709E505}.Release|Mixed Platforms.ActiveCfg = Release|x86
{8E81B2FD-1F8C-4C8C-B5B5-B8600709E505}.Release|Mixed Platforms.Build.0 = Release|x86
{8E81B2FD-1F8C-4C8C-B5B5-B8600709E505}.Release|x86.ActiveCfg = Release|x86
{8E81B2FD-1F8C-4C8C-B5B5-B8600709E505}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = ShippoTesting\ShippoExample.csproj
Policies = $0
$0.TextStylePolicy = $1
$1.FileWidth = 120
$1.inheritsSet = VisualStudio
$1.inheritsScope = text/plain
$1.scope = text/x-csharp
$0.CSharpFormattingPolicy = $2
$2.NamespaceBraceStyle = EndOfLine
$2.ClassBraceStyle = EndOfLine
$2.InterfaceBraceStyle = EndOfLine
$2.SpacesAfterTypecast = True
$2.inheritsSet = Mono
$2.inheritsScope = text/x-csharp
$2.scope = text/x-csharp
$0.StandardHeader = $3
$3.Text =
$3.IncludeInNewFiles = True
{6816FD58-3FC6-4EFC-95F8-D11E9C1D387F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6816FD58-3FC6-4EFC-95F8-D11E9C1D387F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6816FD58-3FC6-4EFC-95F8-D11E9C1D387F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6816FD58-3FC6-4EFC-95F8-D11E9C1D387F}.Release|Any CPU.Build.0 = Release|Any CPU
{7712EC9C-2581-49EE-8B61-745843F2CD6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7712EC9C-2581-49EE-8B61-745843F2CD6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7712EC9C-2581-49EE-8B61-745843F2CD6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7712EC9C-2581-49EE-8B61-745843F2CD6F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {62C615CA-09FE-4FD1-B71D-6D327A4C17F2}
EndGlobalSection
EndGlobal
36 changes: 0 additions & 36 deletions Shippo/Properties/AssemblyInfo.cs

This file was deleted.

136 changes: 53 additions & 83 deletions Shippo/Shippo.csproj
Original file line number Diff line number Diff line change
@@ -1,96 +1,66 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{218CF4C2-C457-43E4-9D1B-0880D10181FF}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Shippo</RootNamespace>
<AssemblyName>Shippo</AssemblyName>
<FileAlignment>512</FileAlignment>
<TargetFrameworks>net45;net40</TargetFrameworks>
<Version>2.1.10</Version>
<Title>Shippo client library</Title>
<Description>.NET library which integrates with Shippo Multi Carrier Shipping API. This library provides access to Shippo (goshippo.com) API capabilities. Including label generation, rating, tracking and more.</Description>
<Summary>Shippo Shipping API client Library (USPS, FedEx, UPS, and more)</Summary>
<PackageProjectUrl>https://github.com/goshippo/shippo-csharp-client/</PackageProjectUrl>
<RepositoryUrl>https://github.com/goshippo/shippo-csharp-client/</RepositoryUrl>
<PackageTags>USPS Fedex UPS API Shippo</PackageTags>
<PackageReleaseNotes>Added support for OAuth Token with net40 and net45</PackageReleaseNotes>
<RepositoryType>Github</RepositoryType>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>lib\net40\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

<PropertyGroup Condition="'$(Configuration)'=='Debug'">
<DefineConstants>TRACE;DEBUG;</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<NoWarn>$(NoWarn);CS1591;CS1572;CS1573</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IncludeSymbols>false</IncludeSymbols>
<DefineConstants>RELEASE</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Web" />
<Reference Include="System.Security" />
<Reference Include="System.Xml" />
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="ShippoCollection.cs" />
<Compile Include="ShippoDateTimeInfo.cs" />
<Compile Include="DateTimeExtensions.cs" />
<Compile Include="ShippoError.cs" />
<Compile Include="ShippoException.cs" />
<Compile Include="ShippoObjectConverter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UnixDateTimeConverter.cs" />
<Compile Include="ShippoObject.cs" />
<Compile Include="IUrlEncoderInfo.cs" />
<Compile Include="ShippoEnumConverter.cs" />
<Compile Include="Parcel.cs" />
<Compile Include="Address.cs" />
<Compile Include="Shipment.cs" />
<Compile Include="Transaction.cs" />
<Compile Include="Rate.cs" />
<Compile Include="CarrierAccount.cs" />
<Compile Include="CustomsItem.cs" />
<Compile Include="CustomsDeclaration.cs" />
<Compile Include="Refund.cs" />
<Compile Include="Manifest.cs" />
<Compile Include="APIResource.cs" />
<Compile Include="RequestTimeoutException.cs" />
<Compile Include="Batch.cs" />
<Compile Include="ObjectResults.cs" />
<Compile Include="BatchShipments.cs" />
<Compile Include="BatchShipment.cs" />
<Compile Include="Track.cs" />
<Compile Include="Servicelevel.cs" />
<Compile Include="ShortAddress.cs" />
<Compile Include="TrackingHistory.cs" />
<Compile Include="TrackingStatus.cs" />
<Compile Include="ShippoEnums.cs" />
<Compile Include="AddressValidation\ValidationResults.cs" />
<Compile Include="AddressValidation\ValidationMessage.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="AddressValidation\" />
<Reference Include="System.Configuration" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45'">
<DefineConstants>NET45;NETFULL</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
<WarningLevel>4</WarningLevel>
</PropertyGroup>


<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Web" />
<Reference Include="System.Security" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
21 changes: 0 additions & 21 deletions Shippo/Shippo.nuspec

This file was deleted.

Binary file removed Shippo/lib/net40/Shippo.pdb
Binary file not shown.
Loading

0 comments on commit bc85f10

Please sign in to comment.