Skip to content

Commit

Permalink
Upgrade to PackageReference + ref latest wildcard version
Browse files Browse the repository at this point in the history
  • Loading branch information
@mythz
mythz committed Jan 15, 2021
1 parent 39dfdd3 commit 10f2002
Show file tree
Hide file tree
Showing 16 changed files with 130 additions and 465 deletions.
208 changes: 35 additions & 173 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,28 @@
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
[Bb]in/
[Oo]bj/
.idea/
.vs/

# mstest test results
TestResults

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

staging-console/
staging-winforms/
apps/

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates
.vs/
*.secrets.cs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
deploy/
x64/
x86/
build/
bld/
[Bb]in/
[Oo]bj/

# Roslyn cache directories
*.ide/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

#NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
Expand All @@ -56,64 +36,36 @@ dlldata.c
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.txt
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding addin-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover
_ReSharper*

# NCrunch
_NCrunch_*
*.ncrunch*
.*crunch*.local.xml

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/
# Installshield output folder
[Ee]xpress

# DocProject is a documentation generator add-in
DocProject/buildhelp/
Expand All @@ -126,133 +78,43 @@ DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/
publish

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
*.Publish.xml

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# If using the old MSBuild-Integrated Package Restore, uncomment this:
#!**/packages/repositories.config
# NuGet Packages Directory
packages

# Windows Azure Build Output
csx/
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
[Bb]in
[Oo]bj
sql
*.Cache
ClientBin/
ClientBin
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
jspm_packages/
staging-console/
staging-winforms/

Generated_Code #added for RIA/Silverlight projects

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# =========================
# Operating System Files
# =========================

# OSX
# =========================

.DS_Store
.AppleDouble
.LSOverride

# Thumbnails
._*

# Files that might appear on external disk
.Spotlight-V100
.Trashes

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# Windows
# =========================

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk
src/BenchmarkAnalyzer/BenchmarkAnalyzer/BenchmarkAnalyzer/wwwroot_build/BenchmarkAnalyzer-console.exe
src/BenchmarkAnalyzer/BenchmarkAnalyzer/BenchmarkAnalyzer/wwwroot_build/BenchmarkAnalyzer-winforms.exe
src/React-Chat-Gap/React-Chat-Gap/React_Chat_Gap/wwwroot_build/React_Chat_Gap-console.exe
*.7z
wwwroot/
src/React-Chat-Gap/React-Chat-Gap/React_Chat_Gap/wwwroot_build/React_Chat_Gap-winforms.exe
src/React-Chat-Gap/React-Chat-Gap/React_Chat_Gap/wwwroot_build/React_Chat_Gap-winforms.exe
src/ReactChat/ReactChat/ReactChat/wwwroot_build/ReactChat-console.exe
src/ReactChat/ReactChat/ReactChat/wwwroot_build/ReactChat-winforms.exe
src/ReactChat/ReactChat/ReactChat/wwwroot_build/apps/ReactChat-console.exe
src/ReactChat/ReactChat/ReactChat/wwwroot_build/apps/ReactChat-winforms.exe
src/ReactChat/ReactChat/ReactChat/webdeploy.zip
src/ReactChat/ReactChat/ReactChat/wwwroot_build/deploy/appsettings.txt
src/ReactChat/ReactChat/ReactChat.Resources/appsettings.txt
src/ReactChat/ReactChat/ReactChat.Resources/appsettings.txt
src/ReactChat/ReactChat/ReactChat/wwwroot_build/deploy/appsettings.txt
src/ReactChat/ReactChat/ReactChat/wwwroot_build/deploy/appsettings.txt
src/ReactChat/ReactChat/webdeploy.zip
ssl/
*.crt
*.ssl
*.pem
results/
teststub.*
*.sqlite
43 changes: 12 additions & 31 deletions src/DefaultApp/DefaultApp/DefaultApp.AppConsole/DefaultApp.AppConsole.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DefaultApp.AppConsole</RootNamespace>
<AssemblyName>DefaultApp.AppConsole</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<LangVersion>default</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -37,30 +38,6 @@
<ApplicationIcon>logo.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="ServiceStack, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ServiceStack.4.5.12\lib\net45\ServiceStack.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Client, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ServiceStack.Client.4.5.12\lib\net45\ServiceStack.Client.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Common, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ServiceStack.Common.4.5.12\lib\net45\ServiceStack.Common.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
<HintPath>..\..\packages\ServiceStack.Interfaces.4.5.12\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.OrmLite, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ServiceStack.OrmLite.4.5.12\lib\net45\ServiceStack.OrmLite.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Redis, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ServiceStack.Redis.4.5.12\lib\net45\ServiceStack.Redis.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Server, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ServiceStack.Server.4.5.12\lib\net45\ServiceStack.Server.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Text, Version=4.5.12.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ServiceStack.Text.4.5.12\lib\net45\ServiceStack.Text.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand All @@ -76,7 +53,6 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DefaultApp.Resources\DefaultApp.Resources.csproj">
Expand All @@ -99,12 +75,17 @@
<ItemGroup>
<EmbeddedResource Include="logo.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ServiceStack" Version="5.*" />
<PackageReference Include="ServiceStack.Client" Version="5.*" />
<PackageReference Include="ServiceStack.Common" Version="5.*" />
<PackageReference Include="ServiceStack.Interfaces" Version="5.*" />
<PackageReference Include="ServiceStack.OrmLite" Version="5.*" />
<PackageReference Include="ServiceStack.Redis" Version="5.*" />
<PackageReference Include="ServiceStack.Server" Version="5.*" />
<PackageReference Include="ServiceStack.Text" Version="5.*" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
11 changes: 0 additions & 11 deletions src/DefaultApp/DefaultApp/DefaultApp.AppConsole/packages.config
View file

This file was deleted.

Loading

0 comments on commit 10f2002

Please sign in to comment.