Skip to content

Commit bbe5dca

Browse files
thinkingseriousthinkingserious
authored
Merge pull request #471 from xt0rted/update-projects-to-msbuild
Migrate projects back to csproj
2 parents bc34d77 + f3592c3 commit bbe5dca

File tree

13 files changed

+106
-192
lines changed

13 files changed

+106
-192
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: csharp
2-
dotnet: 1.0.0-preview2-003131
2+
dotnet: 1.0.4
33
os: linux
44
dist: trusty
55
mono: latest
@@ -17,6 +17,8 @@ before_install:
1717
- ls /usr/lib/mono/4.5/MSBuild
1818

1919
before_script:
20+
# https://github.com/dotnet/sdk/issues/335
21+
- if test "$TRAVIS_OS_NAME" == "osx"; then export FrameworkPathOverride=/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/; else export FrameworkPathOverride=/usr/lib/mono/4.5/; fi
2022
- mkdir prism/bin
2123
- export PATH=$PATH:$PWD/prism/bin/
2224
- ./prism/prism.sh
@@ -25,7 +27,7 @@ before_script:
2527
script:
2628
- dotnet restore
2729
- dotnet build ./src/SendGrid -c Release
28-
- dotnet test ./tests/SendGrid.Tests -c Release -f netcoreapp1.0
30+
- dotnet test ./tests/SendGrid.Tests/SendGrid.Tests.csproj -c Release -f netcoreapp1.0
2931

3032
notifications:
3133
hipchat:

‎ExampleCoreProject/ExampleCore.xproj‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎ExampleCoreProject/ExampleCoreProject.csproj‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp1.0</TargetFramework>
5+
<AssemblyName>ExampleCoreProject</AssemblyName>
6+
<OutputType>Exe</OutputType>
7+
<PackageId>ExampleCoreProject</PackageId>
8+
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
9+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
10+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
11+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<ProjectReference Include="..\src\SendGrid\SendGrid.csproj" />
16+
</ItemGroup>
17+
18+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
19+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
20+
<PackageReference Include="System.Net.Http" Version="4.3.2" />
21+
</ItemGroup>
22+
23+
</Project>

‎ExampleCoreProject/project.json‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎ExampleNet45Project/ExampleNet45.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@
3939
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
42-
<Reference Include="SendGrid">
43-
<HintPath>..\src\SendGrid\bin\Release\net452\SendGrid.dll</HintPath>
44-
</Reference>
4542
<Reference Include="System" />
4643
<Reference Include="System.Core" />
4744
<Reference Include="System.Xml.Linq" />
@@ -59,6 +56,12 @@
5956
<None Include="App.config" />
6057
<None Include="packages.config" />
6158
</ItemGroup>
59+
<ItemGroup>
60+
<ProjectReference Include="..\src\SendGrid\SendGrid.csproj">
61+
<Project>{377c20e4-2297-488f-933b-fb635c56d8fc}</Project>
62+
<Name>SendGrid</Name>
63+
</ProjectReference>
64+
</ItemGroup>
6265
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6366
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6467
Other similar extension points exist, see Microsoft.Common.targets.

‎SendGrid.sln‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26430.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{71C09624-020B-410E-A8FE-1FD216A1FE31}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{33D9EC2F-B286-40BE-8148-E52A1D8A83E7}"
9-
ProjectSection(SolutionItems) = preProject
10-
global.json = global.json
11-
EndProjectSection
12-
EndProject
13-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SendGrid", "src\SendGrid\SendGrid.xproj", "{377C20E4-2297-488F-933B-FB635C56D8FC}"
14-
EndProject
158
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D06BDAE9-BE83-448F-8AD4-3044BB187C11}"
169
EndProject
17-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SendGrid.Tests", "tests\SendGrid.Tests\SendGrid.Tests.xproj", "{D89ADAEA-2BE8-49AC-B5BC-6EABBB2AE4E3}"
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Example Projects", "Example Projects", "{D3201F71-A289-4136-AC7E-E5204ACB9183}"
11+
EndProject
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SendGrid", "src\SendGrid\SendGrid.csproj", "{377C20E4-2297-488F-933B-FB635C56D8FC}"
1813
EndProject
19-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExampleCore", "ExampleCoreProject\ExampleCore.xproj", "{4BD07A97-8AD2-4134-848E-6A74EB992050}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SendGrid.Tests", "tests\SendGrid.Tests\SendGrid.Tests.csproj", "{D89ADAEA-2BE8-49AC-B5BC-6EABBB2AE4E3}"
2015
EndProject
21-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Example Projects", "Example Projects", "{D3201F71-A289-4136-AC7E-E5204ACB9183}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExampleCoreProject", "ExampleCoreProject\ExampleCoreProject.csproj", "{4BD07A97-8AD2-4134-848E-6A74EB992050}"
2217
EndProject
2318
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleNet45", "ExampleNet45Project\ExampleNet45.csproj", "{3B3F2699-F720-4498-8044-262EFE110A22}"
2419
EndProject
25-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SendGrid.ASPSamples", "ExampleNet45ASPNetProject\SendGrid.ASPSamples\SendGrid.ASPSamples.csproj", "{14FA0F22-DFB2-4CE2-867A-242E75F64E1B}"
26-
EndProject
2720
Global
2821
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2922
Debug|Any CPU = Debug|Any CPU
@@ -46,10 +39,6 @@ Global
4639
{3B3F2699-F720-4498-8044-262EFE110A22}.Debug|Any CPU.Build.0 = Debug|Any CPU
4740
{3B3F2699-F720-4498-8044-262EFE110A22}.Release|Any CPU.ActiveCfg = Release|Any CPU
4841
{3B3F2699-F720-4498-8044-262EFE110A22}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{14FA0F22-DFB2-4CE2-867A-242E75F64E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{14FA0F22-DFB2-4CE2-867A-242E75F64E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{14FA0F22-DFB2-4CE2-867A-242E75F64E1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{14FA0F22-DFB2-4CE2-867A-242E75F64E1B}.Release|Any CPU.Build.0 = Release|Any CPU
5342
EndGlobalSection
5443
GlobalSection(SolutionProperties) = preSolution
5544
HideSolutionNode = FALSE
@@ -59,6 +48,5 @@ Global
5948
{D89ADAEA-2BE8-49AC-B5BC-6EABBB2AE4E3} = {D06BDAE9-BE83-448F-8AD4-3044BB187C11}
6049
{4BD07A97-8AD2-4134-848E-6A74EB992050} = {D3201F71-A289-4136-AC7E-E5204ACB9183}
6150
{3B3F2699-F720-4498-8044-262EFE110A22} = {D3201F71-A289-4136-AC7E-E5204ACB9183}
62-
{14FA0F22-DFB2-4CE2-867A-242E75F64E1B} = {D3201F71-A289-4136-AC7E-E5204ACB9183}
6351
EndGlobalSection
6452
EndGlobal

‎global.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/SendGrid/SendGrid.csproj‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<VersionPrefix>9.4.1</VersionPrefix>
5+
<TargetFrameworks>netstandard1.3;net452</TargetFrameworks>
6+
<PlatformTarget>anycpu</PlatformTarget>
7+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
8+
<AssemblyName>SendGrid</AssemblyName>
9+
<OutputType>Library</OutputType>
10+
<AssemblyOriginatorKeyFile>../../tools/sendgrid-csharp.snk</AssemblyOriginatorKeyFile>
11+
<SignAssembly>true</SignAssembly>
12+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
13+
<PackageId>SendGrid</PackageId>
14+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
15+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
16+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
17+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
18+
</PropertyGroup>
19+
20+
<ItemGroup>
21+
<PackageReference Include="StyleCop.Analyzers" Version="1.0.0">
22+
<PrivateAssets>All</PrivateAssets>
23+
</PackageReference>
24+
</ItemGroup>
25+
26+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
27+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.1.2" />
28+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
32+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
33+
<Reference Include="System.Net.Http" />
34+
<Reference Include="System.Runtime.Serialization" />
35+
<Reference Include="System" />
36+
<Reference Include="Microsoft.CSharp" />
37+
</ItemGroup>
38+
39+
</Project>

‎src/SendGrid/SendGrid.xproj‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/SendGrid/project.json‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)