Skip to content

Commit a3fcf3d

Browse files
committed
Upgrade to PackageReference + ref latest wildcard version
1 parent 4f31f3d commit a3fcf3d

File tree

14 files changed

+150
-381
lines changed

14 files changed

+150
-381
lines changed

.gitignore

Lines changed: 37 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,30 @@
1+
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
2+
[Bb]in/
3+
[Oo]bj/
4+
.idea/
5+
.vs/
6+
node_modules/
7+
bower_components/
8+
9+
# mstest test results
10+
TestResults
11+
112
## Ignore Visual Studio temporary files, build results, and
213
## files generated by popular Visual Studio add-ons.
314

415
# User-specific files
516
*.suo
617
*.user
718
*.sln.docstates
8-
.vs/
919
*.secrets.cs
1020

1121
# Build results
1222
[Dd]ebug/
13-
[Dd]ebugPublic/
1423
[Rr]elease/
15-
[Rr]eleases/
24+
deploy/
1625
x64/
17-
x86/
18-
build/
19-
bld/
20-
[Bb]in/
21-
[Oo]bj/
22-
23-
# Roslyn cache directories
24-
*.ide/
25-
26-
# MSTest test Results
27-
[Tt]est[Rr]esult*/
28-
[Bb]uild[Ll]og.*
29-
30-
#NUNIT
31-
*.VisualState.xml
32-
TestResult.xml
33-
34-
# Build Results of an ATL Project
35-
[Dd]ebugPS/
36-
[Rr]eleasePS/
37-
dlldata.c
38-
3926
*_i.c
4027
*_p.c
41-
*_i.h
4228
*.ilk
4329
*.meta
4430
*.obj
@@ -52,64 +38,36 @@ dlldata.c
5238
*.tli
5339
*.tlh
5440
*.tmp
55-
*.tmp_proj
5641
*.log
42+
*.txt
5743
*.vspscc
5844
*.vssscc
5945
.builds
60-
*.pidb
61-
*.svclog
62-
*.scc
63-
64-
# Chutzpah Test files
65-
_Chutzpah*
6646

6747
# Visual C++ cache files
6848
ipch/
6949
*.aps
7050
*.ncb
7151
*.opensdf
7252
*.sdf
73-
*.cachefile
7453

7554
# Visual Studio profiler
7655
*.psess
7756
*.vsp
7857
*.vspx
7958

80-
# TFS 2012 Local Workspace
81-
$tf/
82-
8359
# Guidance Automation Toolkit
8460
*.gpState
8561

8662
# ReSharper is a .NET coding add-in
87-
_ReSharper*/
88-
*.[Rr]e[Ss]harper
89-
*.DotSettings.user
90-
91-
# JustCode is a .NET coding addin-in
92-
.JustCode
93-
94-
# TeamCity is a build add-in
95-
_TeamCity*
96-
97-
# DotCover is a Code Coverage Tool
98-
*.dotCover
63+
_ReSharper*
9964

10065
# NCrunch
101-
_NCrunch_*
66+
*.ncrunch*
10267
.*crunch*.local.xml
10368

104-
# MightyMoose
105-
*.mm.*
106-
AutoTest.Net/
107-
108-
# Web workbench (sass)
109-
.sass-cache/
110-
111-
# Installshield output folder
112-
[Ee]xpress/
69+
# Installshield output folder
70+
[Ee]xpress
11371

11472
# DocProject is a documentation generator add-in
11573
DocProject/buildhelp/
@@ -122,74 +80,43 @@ DocProject/Help/Html2
12280
DocProject/Help/html
12381

12482
# Click-Once directory
125-
publish/
83+
publish
12684

12785
# Publish Web Output
128-
*.[Pp]ublish.xml
129-
*.azurePubxml
130-
# TODO: Comment the next line if you want to checkin your web deploy settings
131-
# but database connection strings (with potential passwords) will be unencrypted
132-
*.pubxml
133-
*.publishproj
134-
135-
# NuGet Packages
136-
*.nupkg
137-
# The packages folder can be ignored because of Package Restore
138-
**/packages/*
139-
# except build/, which is used as an MSBuild target.
140-
!**/packages/build/
141-
# If using the old MSBuild-Integrated Package Restore, uncomment this:
142-
#!**/packages/repositories.config
86+
*.Publish.xml
87+
88+
# NuGet Packages Directory
89+
packages
14390

14491
# Windows Azure Build Output
145-
csx/
92+
csx
14693
*.build.csdef
14794

14895
# Windows Store app package directory
14996
AppPackages/
15097

15198
# Others
152-
sql/
99+
[Bb]in
100+
[Oo]bj
101+
sql
153102
*.Cache
154-
ClientBin/
103+
ClientBin
155104
[Ss]tyle[Cc]op.*
156105
~$*
157-
*~
158106
*.dbmdl
159-
*.dbproj.schemaview
160-
*.pfx
161-
*.publishsettings
162-
node_modules/
163107

164-
# RIA/Silverlight projects
165-
Generated_Code/
108+
Generated_Code #added for RIA/Silverlight projects
166109

167-
# Backup & report files from converting an old project file
168-
# to a newer Visual Studio version. Backup files are not needed,
169-
# because we have git ;-)
110+
# Backup & report files from converting an old project file to a newer
111+
# Visual Studio version. Backup files are not needed, because we have git ;-)
170112
_UpgradeReport_Files/
171113
Backup*/
172114
UpgradeLog*.XML
173-
UpgradeLog*.htm
174-
175-
# SQL Server files
176-
*.mdf
177-
*.ldf
178-
179-
# Business Intelligence projects
180-
*.rdl.data
181-
*.bim.layout
182-
*.bim_*.settings
183115

184-
# Microsoft Fakes
185-
FakesAssemblies/
186-
187-
#Javascript Bower and NPM depedencies
188-
npm_components/
189-
wwwroot/
190-
bower_components/
191-
App_Data/
192-
src/TechStacks/TechStacks/webdeploy.zip
193-
.idea/
194-
*.txt
195-
src/.vs/config/applicationhost.config
116+
ssl/
117+
*.crt
118+
*.ssl
119+
*.pem
120+
results/
121+
teststub.*
122+
*.sqlite

src/TechStacks/TechStacks.ServiceInterface/TechStacks.ServiceInterface.csproj

Lines changed: 16 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>TechStacks.ServiceInterface</RootNamespace>
1111
<AssemblyName>TechStacks.ServiceInterface</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<RestorePackages>true</RestorePackages>
1515
<NuGetPackageImportStamp>
1616
</NuGetPackageImportStamp>
17+
<LangVersion>default</LangVersion>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<DebugSymbols>true</DebugSymbols>
@@ -33,44 +34,11 @@
3334
<WarningLevel>4</WarningLevel>
3435
</PropertyGroup>
3536
<ItemGroup>
36-
<Reference Include="ServiceStack, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
37-
<HintPath>..\..\packages\ServiceStack.5.6.0\lib\net45\ServiceStack.dll</HintPath>
38-
</Reference>
39-
<Reference Include="ServiceStack.Client, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
40-
<HintPath>..\..\packages\ServiceStack.Client.5.6.0\lib\net45\ServiceStack.Client.dll</HintPath>
41-
</Reference>
42-
<Reference Include="ServiceStack.Common, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
43-
<HintPath>..\..\packages\ServiceStack.Common.5.6.0\lib\net45\ServiceStack.Common.dll</HintPath>
44-
</Reference>
45-
<Reference Include="ServiceStack.Interfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\ServiceStack.Interfaces.5.6.0\lib\net45\ServiceStack.Interfaces.dll</HintPath>
47-
</Reference>
48-
<Reference Include="ServiceStack.OrmLite, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\ServiceStack.OrmLite.5.6.0\lib\net45\ServiceStack.OrmLite.dll</HintPath>
50-
</Reference>
51-
<Reference Include="ServiceStack.Redis, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
52-
<HintPath>..\..\packages\ServiceStack.Redis.5.6.0\lib\net45\ServiceStack.Redis.dll</HintPath>
53-
</Reference>
54-
<Reference Include="ServiceStack.Server, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\ServiceStack.Server.5.6.0\lib\net45\ServiceStack.Server.dll</HintPath>
56-
</Reference>
57-
<Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
58-
<HintPath>..\..\packages\ServiceStack.Text.5.6.0\lib\net45\ServiceStack.Text.dll</HintPath>
59-
</Reference>
6037
<Reference Include="System" />
61-
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\System.Buffers.4.5.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
63-
</Reference>
6438
<Reference Include="System.ComponentModel.DataAnnotations" />
6539
<Reference Include="System.Configuration" />
66-
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
67-
<HintPath>..\..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
68-
</Reference>
6940
<Reference Include="System.Net" />
7041
<Reference Include="System.Core" />
71-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
72-
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
73-
</Reference>
7442
<Reference Include="System.ServiceModel" />
7543
<Reference Include="System.Web" />
7644
<Reference Include="System.Xml.Linq" />
@@ -108,15 +76,22 @@
10876
</ItemGroup>
10977
<ItemGroup>
11078
<None Include="app.config" />
111-
<None Include="packages.config" />
79+
</ItemGroup>
80+
<ItemGroup>
81+
<PackageReference Include="ServiceStack" Version="5.*" />
82+
<PackageReference Include="ServiceStack.Client" Version="5.*" />
83+
<PackageReference Include="ServiceStack.Common" Version="5.*" />
84+
<PackageReference Include="ServiceStack.Interfaces" Version="5.*" />
85+
<PackageReference Include="ServiceStack.OrmLite" Version="5.*" />
86+
<PackageReference Include="ServiceStack.Redis" Version="5.*" />
87+
<PackageReference Include="ServiceStack.Server" Version="5.*" />
88+
<PackageReference Include="ServiceStack.Text" Version="5.*" />
89+
<PackageReference Include="System.Buffers" Version="4.5.1" />
90+
<PackageReference Include="System.Memory" Version="4.5.4" />
91+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
92+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
11293
</ItemGroup>
11394
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
114-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
115-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
116-
<PropertyGroup>
117-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
118-
</PropertyGroup>
119-
</Target>
12095
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
12196
Other similar extension points exist, see Microsoft.Common.targets.
12297
<Target Name="BeforeBuild">

src/TechStacks/TechStacks.ServiceInterface/TechnologyStackServicesAdmin.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public object Post(CreateTechnologyStack request)
6060
techStack.LastModified = techStack.Created;
6161
techStack.Slug = slug;
6262

63-
var techIds = (request.TechnologyIds ?? new List<long>()).ToHashSet();
63+
var techIds = new HashSet<long>(request.TechnologyIds ?? new List<long>());
6464

6565
//Only Post an Update if Stack has TechCount >= 4
6666
var postUpdate = AppSettings.EnableTwitterUpdates() && techIds.Count >= 4;
@@ -134,7 +134,7 @@ public object Put(UpdateTechnologyStack request)
134134
"This TechStack is locked and can only be modified by its Owner or Admins.");
135135
}
136136

137-
var techIds = (request.TechnologyIds ?? new List<long>()).ToHashSet();
137+
var techIds = new HashSet<long>(request.TechnologyIds ?? new List<long>());
138138

139139
//Only Post an Update if there was no other update today and Stack as TechCount >= 4
140140
var postUpdate = AppSettings.EnableTwitterUpdates()
@@ -153,7 +153,7 @@ public object Put(UpdateTechnologyStack request)
153153
Db.Save(techStack);
154154

155155
var existingTechChoices = Db.Select<TechnologyChoice>(q => q.TechnologyStackId == request.Id);
156-
var techIdsToAdd = techIds.Except(existingTechChoices.Select(x => x.TechnologyId)).ToHashSet();
156+
var techIdsToAdd = new HashSet<long>(techIds.Except(existingTechChoices.Select(x => x.TechnologyId)));
157157
var techChoices = techIdsToAdd.Map(x => new TechnologyChoice
158158
{
159159
TechnologyId = x,

src/TechStacks/TechStacks.ServiceInterface/packages.config

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

src/TechStacks/TechStacks.ServiceModel/TechStacks.ServiceModel.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>TechStacks.ServiceModel</RootNamespace>
1111
<AssemblyName>TechStacks.ServiceModel</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
1616
<NuGetPackageImportStamp>
1717
</NuGetPackageImportStamp>
18+
<LangVersion>default</LangVersion>
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2021
<DebugSymbols>true</DebugSymbols>
@@ -34,9 +35,6 @@
3435
<WarningLevel>4</WarningLevel>
3536
</PropertyGroup>
3637
<ItemGroup>
37-
<Reference Include="ServiceStack.Interfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\ServiceStack.Interfaces.5.6.0\lib\net45\ServiceStack.Interfaces.dll</HintPath>
39-
</Reference>
4038
<Reference Include="System" />
4139
<Reference Include="System.Core" />
4240
<Reference Include="System.Runtime.Serialization" />
@@ -60,10 +58,9 @@
6058
<Compile Include="AccountTechStacks.cs" />
6159
</ItemGroup>
6260
<ItemGroup>
63-
<None Include="packages.config" />
61+
<PackageReference Include="ServiceStack.Interfaces" Version="5.*" />
6462
</ItemGroup>
6563
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
66-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
6764
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
6865
<PropertyGroup>
6966
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

src/TechStacks/TechStacks.ServiceModel/packages.config

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

0 commit comments

Comments
 (0)