Skip to content

Commit 0ea623a

Browse files
committed
Migrating to csproj and reorganizing solution.
1 parent ac3c079 commit 0ea623a

21 files changed

+147
-225
lines changed

.gitignore

+59-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*.user
99
*.userosscache
1010
*.sln.docstates
11-
*.vcxproj.filters
1211

1312
# User-specific files (MonoDevelop/Xamarin Studio)
1413
*.userprefs
@@ -25,11 +24,14 @@ bld/
2524
[Oo]bj/
2625
[Ll]og/
2726

28-
# Visual Studio 2015 cache/options directory
27+
# Visual Studio 2015/2017 cache/options directory
2928
.vs/
3029
# Uncomment if you have tasks that create the project's static files in wwwroot
3130
#wwwroot/
3231

32+
# Visual Studio 2017 auto generated files
33+
Generated\ Files/
34+
3335
# MSTest test Results
3436
[Tt]est[Rr]esult*/
3537
[Bb]uild[Ll]og.*
@@ -43,12 +45,19 @@ TestResult.xml
4345
[Rr]eleasePS/
4446
dlldata.c
4547

46-
# DNX
48+
# Benchmark Results
49+
BenchmarkDotNet.Artifacts/
50+
51+
# .NET Core
4752
project.lock.json
4853
project.fragment.lock.json
4954
artifacts/
5055
**/Properties/launchSettings.json
5156

57+
# StyleCop
58+
StyleCopReport.xml
59+
60+
# Files built by Visual Studio
5261
*_i.c
5362
*_p.c
5463
*_i.h
@@ -94,6 +103,9 @@ ipch/
94103
*.vspx
95104
*.sap
96105

106+
# Visual Studio Trace Files
107+
*.e2e
108+
97109
# TFS 2012 Local Workspace
98110
$tf/
99111

@@ -114,6 +126,10 @@ _TeamCity*
114126
# DotCover is a Code Coverage Tool
115127
*.dotCover
116128

129+
# AxoCover is a Code Coverage Tool
130+
.axoCover/*
131+
!.axoCover/settings.json
132+
117133
# Visual Studio code coverage results
118134
*.coverage
119135
*.coveragexml
@@ -149,7 +165,7 @@ publish/
149165
# Publish Web Output
150166
*.[Pp]ublish.xml
151167
*.azurePubxml
152-
# TODO: Comment the next line if you want to checkin your web deploy settings
168+
# Note: Comment the next line if you want to checkin your web deploy settings,
153169
# but database connection strings (with potential passwords) will be unencrypted
154170
*.pubxml
155171
*.publishproj
@@ -162,12 +178,12 @@ PublishScripts/
162178
# NuGet Packages
163179
*.nupkg
164180
# The packages folder can be ignored because of Package Restore
165-
**/packages/*
181+
**/[Pp]ackages/*
166182
# except build/, which is used as an MSBuild target.
167-
!**/packages/build/
183+
!**/[Pp]ackages/build/
168184
# Uncomment if necessary however generally it will be regenerated when needed
169-
#!**/packages/repositories.config
170-
# NuGet v3's project.json files produces more ignoreable files
185+
#!**/[Pp]ackages/repositories.config
186+
# NuGet v3's project.json files produces more ignorable files
171187
*.nuget.props
172188
*.nuget.targets
173189

@@ -184,6 +200,7 @@ AppPackages/
184200
BundleArtifacts/
185201
Package.StoreAssociation.xml
186202
_pkginfo.txt
203+
*.appx
187204

188205
# Visual Studio cache files
189206
# files ending in .cache can be ignored
@@ -200,9 +217,12 @@ ClientBin/
200217
*.jfm
201218
*.pfx
202219
*.publishsettings
203-
node_modules/
204220
orleans.codegen.cs
205221

222+
# Including strong name files can present a security risk
223+
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
224+
#*.snk
225+
206226
# Since there are multiple workflows, uncomment next line to ignore bower_components
207227
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
208228
#bower_components/
@@ -217,10 +237,12 @@ _UpgradeReport_Files/
217237
Backup*/
218238
UpgradeLog*.XML
219239
UpgradeLog*.htm
240+
ServiceFabricBackup/
220241

221242
# SQL Server files
222243
*.mdf
223244
*.ldf
245+
*.ndf
224246

225247
# Business Intelligence projects
226248
*.rdl.data
@@ -235,6 +257,10 @@ FakesAssemblies/
235257

236258
# Node.js Tools for Visual Studio
237259
.ntvs_analysis.dat
260+
node_modules/
261+
262+
# TypeScript v1 declaration files
263+
typings/
238264

239265
# Visual Studio 6 build log
240266
*.plg
@@ -272,4 +298,27 @@ __pycache__/
272298
*.pyc
273299

274300
# Cake - Uncomment if you are using it
275-
# tools/
301+
# tools/**
302+
# !tools/packages.config
303+
304+
# Tabs Studio
305+
*.tss
306+
307+
# Telerik's JustMock configuration file
308+
*.jmconfig
309+
310+
# BizTalk build output
311+
*.btp.cs
312+
*.btm.cs
313+
*.odx.cs
314+
*.xsd.cs
315+
316+
# OpenCover UI analysis results
317+
OpenCover/
318+
319+
# Azure Stream Analytics local run output
320+
ASALocalRun/
321+
322+
# MSBuild Binary and Structured Log
323+
*.binlog
324+

src/CodingMilitia.Utils.Pagination.sln CodingMilitia.Utils.Pagination.sln

+19-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +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.27130.2010
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CodingMilitia.Utils.Pagination", "CodingMilitia.Utils.Pagination\CodingMilitia.Utils.Pagination.xproj", "{ABF39933-08AF-4684-AB3F-AFDB8E2CA141}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodingMilitia.Utils.Pagination", "src\CodingMilitia.Utils.Pagination\CodingMilitia.Utils.Pagination.csproj", "{ABF39933-08AF-4684-AB3F-AFDB8E2CA141}"
77
EndProject
8-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CodingMilitia.Utils.Pagination.EFCore", "CodingMilitia.Utils.Pagination.EFCore\CodingMilitia.Utils.Pagination.EFCore.xproj", "{55B8B0BF-EFC5-4BCA-895D-E9F3BB93088C}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodingMilitia.Utils.Pagination.EFCore", "src\CodingMilitia.Utils.Pagination.EFCore\CodingMilitia.Utils.Pagination.EFCore.csproj", "{55B8B0BF-EFC5-4BCA-895D-E9F3BB93088C}"
99
EndProject
10-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CodingMilitia.Utils.Pagination.Tests", "CodingMilitia.Utils.Pagination.Tests\CodingMilitia.Utils.Pagination.Tests.xproj", "{613657CE-DB51-4BD5-8E74-28FD45D0851A}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodingMilitia.Utils.Pagination.Tests", "tests\CodingMilitia.Utils.Pagination.Tests\CodingMilitia.Utils.Pagination.Tests.csproj", "{613657CE-DB51-4BD5-8E74-28FD45D0851A}"
1111
EndProject
12-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CodingMilitia.Utils.Pagination.EFCore.Tests", "CodingMilitia.Utils.Pagination.EFCore.Tests\CodingMilitia.Utils.Pagination.EFCore.Tests.xproj", "{562567AC-F4BD-4065-A3A4-BC6129BDE526}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodingMilitia.Utils.Pagination.EFCore.Tests", "tests\CodingMilitia.Utils.Pagination.EFCore.Tests\CodingMilitia.Utils.Pagination.EFCore.Tests.csproj", "{562567AC-F4BD-4065-A3A4-BC6129BDE526}"
13+
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8C790BDC-F0C5-47BA-A080-F8F7ACF570D7}"
15+
EndProject
16+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{53D85147-FE1C-47C2-A549-5D804CA3A73B}"
1317
EndProject
1418
Global
1519
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,4 +41,13 @@ Global
3741
GlobalSection(SolutionProperties) = preSolution
3842
HideSolutionNode = FALSE
3943
EndGlobalSection
44+
GlobalSection(NestedProjects) = preSolution
45+
{ABF39933-08AF-4684-AB3F-AFDB8E2CA141} = {8C790BDC-F0C5-47BA-A080-F8F7ACF570D7}
46+
{55B8B0BF-EFC5-4BCA-895D-E9F3BB93088C} = {8C790BDC-F0C5-47BA-A080-F8F7ACF570D7}
47+
{613657CE-DB51-4BD5-8E74-28FD45D0851A} = {53D85147-FE1C-47C2-A549-5D804CA3A73B}
48+
{562567AC-F4BD-4065-A3A4-BC6129BDE526} = {53D85147-FE1C-47C2-A549-5D804CA3A73B}
49+
EndGlobalSection
50+
GlobalSection(ExtensibilityGlobals) = postSolution
51+
SolutionGuid = {B75E7EA2-873C-4860-A4AE-6039AA0BEC49}
52+
EndGlobalSection
4053
EndGlobal

src/CodingMilitia.Utils.Pagination.EFCore.Tests/CodingMilitia.Utils.Pagination.EFCore.Tests.xproj

-21
This file was deleted.

src/CodingMilitia.Utils.Pagination.EFCore.Tests/project.json

-31
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<VersionPrefix>1.0.0-dev003</VersionPrefix>
5+
<TargetFramework>netstandard1.6</TargetFramework>
6+
<AssemblyName>CodingMilitia.Utils.Pagination.EFCore</AssemblyName>
7+
<PackageId>CodingMilitia.Utils.Pagination.EFCore</PackageId>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<ProjectReference Include="..\CodingMilitia.Utils.Pagination\CodingMilitia.Utils.Pagination.csproj" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.0.3" />
16+
</ItemGroup>
17+
18+
</Project>

src/CodingMilitia.Utils.Pagination.EFCore/CodingMilitia.Utils.Pagination.EFCore.xproj

-21
This file was deleted.

src/CodingMilitia.Utils.Pagination.EFCore/Properties/AssemblyInfo.cs

-19
This file was deleted.

src/CodingMilitia.Utils.Pagination.EFCore/project.json

-15
This file was deleted.

src/CodingMilitia.Utils.Pagination.Tests/CodingMilitia.Utils.Pagination.Tests.xproj

-21
This file was deleted.

src/CodingMilitia.Utils.Pagination.Tests/project.json

-28
This file was deleted.

0 commit comments

Comments
 (0)