Skip to content

Commit fe2c2bf

Browse files
xt0rtedxt0rted
committed
Migrate projects back to csproj
1 parent bc34d77 commit fe2c2bf

File tree

12 files changed

+106
-181
lines changed

12 files changed

+106
-181
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
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

‎ExampleCoreProject/ExampleCore.xproj‎

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

‎ExampleCoreProject/ExampleCoreProject.csproj‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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.0" />
21+
<PackageReference Include="WinInsider.System.Net.Http.Formatting" Version="1.0.1" />
22+
</ItemGroup>
23+
24+
</Project>

‎ExampleCoreProject/project.json‎

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

‎SendGrid.sln‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
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}"
1811
EndProject
19-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExampleCore", "ExampleCoreProject\ExampleCore.xproj", "{4BD07A97-8AD2-4134-848E-6A74EB992050}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SendGrid", "src\SendGrid\SendGrid.csproj", "{377C20E4-2297-488F-933B-FB635C56D8FC}"
2013
EndProject
21-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Example Projects", "Example Projects", "{D3201F71-A289-4136-AC7E-E5204ACB9183}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SendGrid.Tests", "tests\SendGrid.Tests\SendGrid.Tests.csproj", "{D89ADAEA-2BE8-49AC-B5BC-6EABBB2AE4E3}"
15+
EndProject
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

‎global.json‎

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

‎src/SendGrid/SendGrid.csproj‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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.0" />
28+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
29+
</ItemGroup>
30+
31+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
32+
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
33+
</PropertyGroup>
34+
35+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
36+
<DefineConstants>$(DefineConstants);NET452</DefineConstants>
37+
</PropertyGroup>
38+
39+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
40+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
41+
<Reference Include="System.Net.Http" />
42+
<Reference Include="System.Runtime.Serialization" />
43+
<Reference Include="System" />
44+
<Reference Include="Microsoft.CSharp" />
45+
</ItemGroup>
46+
47+
</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.

‎tests/SendGrid.Tests/SendGrid.Tests.csproj‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp1.0</TargetFramework>
5+
<AssemblyName>SendGrid.Tests</AssemblyName>
6+
<PackageId>SendGrid.Tests</PackageId>
7+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
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>
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
20+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
21+
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
22+
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
23+
<PackageReference Include="system.diagnostics.textwritertracelistener" Version="4.3.0" />
24+
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
25+
</ItemGroup>
26+
27+
</Project>

0 commit comments

Comments
 (0)