Skip to content

Commit 94a271e

Browse files
SapientGuardianSapientGuardian
authored
Merge pull request #1 from SapientGuardian/vs2017
Upgraded to csproj
2 parents 241e73e + be5c610 commit 94a271e

10 files changed

+86
-177
lines changed

Diff for: ‎.travis.yml

-60
This file was deleted.

Diff for: ‎LibPacketGremlin.sln

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.9
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{61C6CCBC-2613-4FF6-93B0-533746A87808}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{85C76C2E-90E5-4E11-A66F-85766B027EBE}"
99
ProjectSection(SolutionItems) = preProject
10-
global.json = global.json
1110
NuGet.Config = NuGet.Config
1211
README.md = README.md
1312
EndProjectSection
1413
EndProject
15-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LibPacketGremlin", "src\LibPacketGremlin\LibPacketGremlin.xproj", "{EB4C9272-709A-421D-931A-4BA74086A8A7}"
16-
EndProject
1714
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6ADCDE7C-AC29-4AD4-8C75-85A0A02900F4}"
1815
EndProject
19-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LibPacketGremlinTests", "test\LibPacketGremlinTests\LibPacketGremlinTests.xproj", "{1E6E6DD7-A211-4985-A3C1-60488CB08709}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibPacketGremlin", "src\LibPacketGremlin\LibPacketGremlin.csproj", "{EB4C9272-709A-421D-931A-4BA74086A8A7}"
17+
EndProject
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibPacketGremlinTests", "test\LibPacketGremlinTests\LibPacketGremlinTests.csproj", "{1E6E6DD7-A211-4985-A3C1-60488CB08709}"
2019
EndProject
2120
Global
2221
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Diff for: ‎appveyor.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
version: 1.0.0-rc2-{build}
2-
image: Visual Studio 2015
1+
version: 1.0.0-{build}
2+
image: Visual Studio 2017
3+
install:
4+
- appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/v4.0.0/nuget.exe
35
build_script:
46
- cmd: >-
5-
dotnet restore -v Warning
7+
dotnet restore
68
79
dotnet pack .\src\LibPacketGremlin -o .\artifacts\LibPacketGremlin -c Release
10+
11+
move .\src\LibPacketGremlin\artifacts .\
812
test_script:
913
- cmd: >-
1014
cd test\LibPacketGremlinTests

Diff for: ‎global.json

-6
This file was deleted.

Diff for: ‎src/LibPacketGremlin/LibPacketGremlin.csproj

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>Library for manipulating packets</Description>
5+
<Copyright>Copyright © 2016 Outbreak Labs</Copyright>
6+
<VersionPrefix>1.0.0-rc2-001</VersionPrefix>
7+
<Authors>Noah Potash</Authors>
8+
<TargetFramework>netstandard1.3</TargetFramework>
9+
<AssemblyName>LibPacketGremlin</AssemblyName>
10+
<OutputType>Library</OutputType>
11+
<PackageId>LibPacketGremlin</PackageId>
12+
<PackageTags>packet;packets</PackageTags>
13+
<PackageIconUrl>https://raw.githubusercontent.com/SapientGuardian/LibPacketGremlin/master/resources/Gremlin64x64.png</PackageIconUrl>
14+
<PackageProjectUrl>https://github.com/SapientGuardian/LibPacketGremlin</PackageProjectUrl>
15+
<PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
16+
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
17+
<Version>1.0.1</Version>
18+
<AssemblyVersion>0.1.0.1</AssemblyVersion>
19+
<FileVersion>0.1.0.1</FileVersion>
20+
</PropertyGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
24+
<PackageReference Include="System.Collections" Version="4.3.0" />
25+
<PackageReference Include="System.Linq" Version="4.3.0" />
26+
<PackageReference Include="System.Runtime" Version="4.3.0" />
27+
<PackageReference Include="System.Threading" Version="4.3.0" />
28+
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
29+
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
30+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
31+
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
32+
<PackageReference Include="System.Net.Primitives" Version="4.3.0" />
33+
</ItemGroup>
34+
35+
</Project>

Diff for: ‎src/LibPacketGremlin/LibPacketGremlin.xproj

-24
This file was deleted.

Diff for: ‎src/LibPacketGremlin/project.json

-32
This file was deleted.

Diff for: ‎test/LibPacketGremlinTests/LibPacketGremlinTests.csproj

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp1.0</TargetFramework>
5+
<AssemblyName>LibPacketGremlinTests</AssemblyName>
6+
<PackageId>LibPacketGremlinTests</PackageId>
7+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
8+
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
9+
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
10+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
11+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
12+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
13+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
16+
</PropertyGroup>
17+
18+
<ItemGroup>
19+
<ProjectReference Include="..\..\src\LibPacketGremlin\LibPacketGremlin.csproj" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
24+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
25+
<PackageReference Include="xunit" Version="2.2.0" />
26+
<PackageReference Include="FluentAssertions" Version="4.19.2" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
31+
</ItemGroup>
32+
33+
<ItemGroup>
34+
<None Update="Resources\radiotap.bin">
35+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
36+
</None>
37+
</ItemGroup>
38+
39+
</Project>

Diff for: ‎test/LibPacketGremlinTests/LibPacketGremlinTests.xproj

-21
This file was deleted.

Diff for: ‎test/LibPacketGremlinTests/project.json

-25
This file was deleted.

0 commit comments

Comments
 (0)