Skip to content

Commit 10f2002

Browse files
committed
Upgrade to PackageReference + ref latest wildcard version
1 parent 39dfdd3 commit 10f2002

File tree

16 files changed

+130
-465
lines changed

16 files changed

+130
-465
lines changed

.gitignore

Lines changed: 35 additions & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,28 @@
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+
7+
# mstest test results
8+
TestResults
9+
110
## Ignore Visual Studio temporary files, build results, and
211
## files generated by popular Visual Studio add-ons.
312

4-
staging-console/
5-
staging-winforms/
6-
apps/
7-
813
# User-specific files
914
*.suo
1015
*.user
11-
*.userosscache
1216
*.sln.docstates
13-
.vs/
17+
*.secrets.cs
1418

1519
# Build results
1620
[Dd]ebug/
17-
[Dd]ebugPublic/
1821
[Rr]elease/
19-
[Rr]eleases/
22+
deploy/
2023
x64/
21-
x86/
22-
build/
23-
bld/
24-
[Bb]in/
25-
[Oo]bj/
26-
27-
# Roslyn cache directories
28-
*.ide/
29-
30-
# MSTest test Results
31-
[Tt]est[Rr]esult*/
32-
[Bb]uild[Ll]og.*
33-
34-
#NUNIT
35-
*.VisualState.xml
36-
TestResult.xml
37-
38-
# Build Results of an ATL Project
39-
[Dd]ebugPS/
40-
[Rr]eleasePS/
41-
dlldata.c
42-
4324
*_i.c
4425
*_p.c
45-
*_i.h
4626
*.ilk
4727
*.meta
4828
*.obj
@@ -56,64 +36,36 @@ dlldata.c
5636
*.tli
5737
*.tlh
5838
*.tmp
59-
*.tmp_proj
6039
*.log
40+
*.txt
6141
*.vspscc
6242
*.vssscc
6343
.builds
64-
*.pidb
65-
*.svclog
66-
*.scc
67-
68-
# Chutzpah Test files
69-
_Chutzpah*
7044

7145
# Visual C++ cache files
7246
ipch/
7347
*.aps
7448
*.ncb
7549
*.opensdf
7650
*.sdf
77-
*.cachefile
7851

7952
# Visual Studio profiler
8053
*.psess
8154
*.vsp
8255
*.vspx
8356

84-
# TFS 2012 Local Workspace
85-
$tf/
86-
8757
# Guidance Automation Toolkit
8858
*.gpState
8959

9060
# ReSharper is a .NET coding add-in
91-
_ReSharper*/
92-
*.[Rr]e[Ss]harper
93-
*.DotSettings.user
94-
95-
# JustCode is a .NET coding addin-in
96-
.JustCode
97-
98-
# TeamCity is a build add-in
99-
_TeamCity*
100-
101-
# DotCover is a Code Coverage Tool
102-
*.dotCover
61+
_ReSharper*
10362

10463
# NCrunch
105-
_NCrunch_*
64+
*.ncrunch*
10665
.*crunch*.local.xml
10766

108-
# MightyMoose
109-
*.mm.*
110-
AutoTest.Net/
111-
112-
# Web workbench (sass)
113-
.sass-cache/
114-
115-
# Installshield output folder
116-
[Ee]xpress/
67+
# Installshield output folder
68+
[Ee]xpress
11769

11870
# DocProject is a documentation generator add-in
11971
DocProject/buildhelp/
@@ -126,133 +78,43 @@ DocProject/Help/Html2
12678
DocProject/Help/html
12779

12880
# Click-Once directory
129-
publish/
81+
publish
13082

13183
# Publish Web Output
132-
*.[Pp]ublish.xml
133-
*.azurePubxml
134-
# TODO: Comment the next line if you want to checkin your web deploy settings
135-
# but database connection strings (with potential passwords) will be unencrypted
136-
*.pubxml
137-
*.publishproj
84+
*.Publish.xml
13885

139-
# NuGet Packages
140-
*.nupkg
141-
# The packages folder can be ignored because of Package Restore
142-
**/packages/*
143-
# except build/, which is used as an MSBuild target.
144-
!**/packages/build/
145-
# If using the old MSBuild-Integrated Package Restore, uncomment this:
146-
#!**/packages/repositories.config
86+
# NuGet Packages Directory
87+
packages
14788

14889
# Windows Azure Build Output
149-
csx/
90+
csx
15091
*.build.csdef
15192

15293
# Windows Store app package directory
15394
AppPackages/
15495

15596
# Others
156-
sql/
97+
[Bb]in
98+
[Oo]bj
99+
sql
157100
*.Cache
158-
ClientBin/
101+
ClientBin
159102
[Ss]tyle[Cc]op.*
160103
~$*
161-
*~
162104
*.dbmdl
163-
*.dbproj.schemaview
164-
*.pfx
165-
*.publishsettings
166-
node_modules/
167-
jspm_packages/
168-
staging-console/
169-
staging-winforms/
170105

106+
Generated_Code #added for RIA/Silverlight projects
171107

172-
# RIA/Silverlight projects
173-
Generated_Code/
174-
175-
# Backup & report files from converting an old project file
176-
# to a newer Visual Studio version. Backup files are not needed,
177-
# because we have git ;-)
108+
# Backup & report files from converting an old project file to a newer
109+
# Visual Studio version. Backup files are not needed, because we have git ;-)
178110
_UpgradeReport_Files/
179111
Backup*/
180112
UpgradeLog*.XML
181-
UpgradeLog*.htm
182-
183-
# SQL Server files
184-
*.mdf
185-
*.ldf
186-
187-
# Business Intelligence projects
188-
*.rdl.data
189-
*.bim.layout
190-
*.bim_*.settings
191-
192-
# Microsoft Fakes
193-
FakesAssemblies/
194-
195-
# =========================
196-
# Operating System Files
197-
# =========================
198-
199-
# OSX
200-
# =========================
201-
202-
.DS_Store
203-
.AppleDouble
204-
.LSOverride
205-
206-
# Thumbnails
207-
._*
208-
209-
# Files that might appear on external disk
210-
.Spotlight-V100
211-
.Trashes
212-
213-
# Directories potentially created on remote AFP share
214-
.AppleDB
215-
.AppleDesktop
216-
Network Trash Folder
217-
Temporary Items
218-
.apdisk
219-
220-
# Windows
221-
# =========================
222-
223-
# Windows image file caches
224-
Thumbs.db
225-
ehthumbs.db
226-
227-
# Folder config file
228-
Desktop.ini
229-
230-
# Recycle Bin used on file shares
231-
$RECYCLE.BIN/
232-
233-
# Windows Installer files
234-
*.cab
235-
*.msi
236-
*.msm
237-
*.msp
238113

239-
# Windows shortcuts
240-
*.lnk
241-
src/BenchmarkAnalyzer/BenchmarkAnalyzer/BenchmarkAnalyzer/wwwroot_build/BenchmarkAnalyzer-console.exe
242-
src/BenchmarkAnalyzer/BenchmarkAnalyzer/BenchmarkAnalyzer/wwwroot_build/BenchmarkAnalyzer-winforms.exe
243-
src/React-Chat-Gap/React-Chat-Gap/React_Chat_Gap/wwwroot_build/React_Chat_Gap-console.exe
244-
*.7z
245-
wwwroot/
246-
src/React-Chat-Gap/React-Chat-Gap/React_Chat_Gap/wwwroot_build/React_Chat_Gap-winforms.exe
247-
src/React-Chat-Gap/React-Chat-Gap/React_Chat_Gap/wwwroot_build/React_Chat_Gap-winforms.exe
248-
src/ReactChat/ReactChat/ReactChat/wwwroot_build/ReactChat-console.exe
249-
src/ReactChat/ReactChat/ReactChat/wwwroot_build/ReactChat-winforms.exe
250-
src/ReactChat/ReactChat/ReactChat/wwwroot_build/apps/ReactChat-console.exe
251-
src/ReactChat/ReactChat/ReactChat/wwwroot_build/apps/ReactChat-winforms.exe
252-
src/ReactChat/ReactChat/ReactChat/webdeploy.zip
253-
src/ReactChat/ReactChat/ReactChat/wwwroot_build/deploy/appsettings.txt
254-
src/ReactChat/ReactChat/ReactChat.Resources/appsettings.txt
255-
src/ReactChat/ReactChat/ReactChat.Resources/appsettings.txt
256-
src/ReactChat/ReactChat/ReactChat/wwwroot_build/deploy/appsettings.txt
257-
src/ReactChat/ReactChat/ReactChat/wwwroot_build/deploy/appsettings.txt
258-
src/ReactChat/ReactChat/webdeploy.zip
114+
ssl/
115+
*.crt
116+
*.ssl
117+
*.pem
118+
results/
119+
teststub.*
120+
*.sqlite

src/DefaultApp/DefaultApp/DefaultApp.AppConsole/DefaultApp.AppConsole.csproj

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>DefaultApp.AppConsole</RootNamespace>
1111
<AssemblyName>DefaultApp.AppConsole</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15+
<LangVersion>default</LangVersion>
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -37,30 +38,6 @@
3738
<ApplicationIcon>logo.ico</ApplicationIcon>
3839
</PropertyGroup>
3940
<ItemGroup>
40-
<Reference Include="ServiceStack, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\..\packages\ServiceStack.4.5.12\lib\net45\ServiceStack.dll</HintPath>
42-
</Reference>
43-
<Reference Include="ServiceStack.Client, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\..\packages\ServiceStack.Client.4.5.12\lib\net45\ServiceStack.Client.dll</HintPath>
45-
</Reference>
46-
<Reference Include="ServiceStack.Common, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\ServiceStack.Common.4.5.12\lib\net45\ServiceStack.Common.dll</HintPath>
48-
</Reference>
49-
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\ServiceStack.Interfaces.4.5.12\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
51-
</Reference>
52-
<Reference Include="ServiceStack.OrmLite, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\..\packages\ServiceStack.OrmLite.4.5.12\lib\net45\ServiceStack.OrmLite.dll</HintPath>
54-
</Reference>
55-
<Reference Include="ServiceStack.Redis, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\ServiceStack.Redis.4.5.12\lib\net45\ServiceStack.Redis.dll</HintPath>
57-
</Reference>
58-
<Reference Include="ServiceStack.Server, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\ServiceStack.Server.4.5.12\lib\net45\ServiceStack.Server.dll</HintPath>
60-
</Reference>
61-
<Reference Include="ServiceStack.Text, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\ServiceStack.Text.4.5.12\lib\net45\ServiceStack.Text.dll</HintPath>
63-
</Reference>
6441
<Reference Include="System" />
6542
<Reference Include="System.Xml.Linq" />
6643
<Reference Include="System.Data.DataSetExtensions" />
@@ -76,7 +53,6 @@
7653
</ItemGroup>
7754
<ItemGroup>
7855
<None Include="App.config" />
79-
<None Include="packages.config" />
8056
</ItemGroup>
8157
<ItemGroup>
8258
<ProjectReference Include="..\DefaultApp.Resources\DefaultApp.Resources.csproj">
@@ -99,12 +75,17 @@
9975
<ItemGroup>
10076
<EmbeddedResource Include="logo.ico" />
10177
</ItemGroup>
78+
<ItemGroup>
79+
<PackageReference Include="ServiceStack" Version="5.*" />
80+
<PackageReference Include="ServiceStack.Client" Version="5.*" />
81+
<PackageReference Include="ServiceStack.Common" Version="5.*" />
82+
<PackageReference Include="ServiceStack.Interfaces" Version="5.*" />
83+
<PackageReference Include="ServiceStack.OrmLite" Version="5.*" />
84+
<PackageReference Include="ServiceStack.Redis" Version="5.*" />
85+
<PackageReference Include="ServiceStack.Server" Version="5.*" />
86+
<PackageReference Include="ServiceStack.Text" Version="5.*" />
87+
</ItemGroup>
10288
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
103-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
104-
<PropertyGroup>
105-
<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>
106-
</PropertyGroup>
107-
</Target>
10889
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
10990
Other similar extension points exist, see Microsoft.Common.targets.
11091
<Target Name="BeforeBuild">

src/DefaultApp/DefaultApp/DefaultApp.AppConsole/packages.config

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

0 commit comments

Comments
 (0)