Skip to content
This repository was archived by the owner on Apr 11, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
74c4c71
#27
christiannagel Nov 17, 2016
9e1378b
MSBuild #27
christiannagel Nov 17, 2016
ef42f5f
MSBuild .NET Core 1.1 #27
christiannagel Nov 17, 2016
4d4e783
MSBuild .NET Core 1.1 #27
christiannagel Nov 17, 2016
a8b605b
MSBuild .NET Core 1.1 #27
christiannagel Nov 17, 2016
009589c
MSBuild .NET Core 1.1 #27
christiannagel Nov 17, 2016
cbc7de8
MSBuild .NET Core 1.1 #27
christiannagel Nov 17, 2016
fdeeb95
MSBuild .NET Core 1.1 #27
christiannagel Nov 17, 2016
50321e4
MSBuild .NET Core 1.1 #27
christiannagel Nov 17, 2016
24b8a14
MSBuild .NET Core 1.1 #27
christiannagel Nov 17, 2016
797d48b
delegates .NET 1.1 msbuild #27
christiannagel Nov 18, 2016
2503006
linq .NET Core 1.1, msbuild #27
christiannagel Nov 19, 2016
c738512
errors and exceptions .net core 1.1 msbuild #27
christiannagel Nov 19, 2016
2e878cc
async samples .net core 1.1 msbuild #27
christiannagel Nov 19, 2016
f406f62
Merge pull request #28 from ProfessionalCSharp/master
christiannagel Nov 19, 2016
1dceffe
simplified csproj
christiannagel Dec 16, 2016
8d2ecda
csproj #29
christiannagel Dec 19, 2016
7a7e4e1
csproj #29
christiannagel Dec 19, 2016
6f50ee6
csproj #29
christiannagel Dec 19, 2016
dfb54d8
#29
christiannagel Dec 19, 2016
4da1b3e
1.1 update #27
christiannagel Dec 19, 2016
5b1705e
1.1 update #27
christiannagel Dec 19, 2016
83e76f3
fix merges
christiannagel Jan 3, 2017
4686146
Merge branch 'master' into vs2017
christiannagel Jan 3, 2017
8de0591
Merge pull request #32 from ProfessionalCSharp/master
christiannagel Feb 1, 2017
1dc401d
update csproj for RC3 #29
christiannagel Feb 1, 2017
a41f27b
Merge pull request #33 from ProfessionalCSharp/master
christiannagel Feb 23, 2017
e298f19
#27 #29
christiannagel Feb 23, 2017
d478ae0
special collections #29
christiannagel Feb 23, 2017
171763a
linq updates vs2017
christiannagel Feb 23, 2017
acf6ce1
#29
christiannagel Feb 24, 2017
7764a98
#27 #29
christiannagel Feb 24, 2017
1c070d7
#29
christiannagel Feb 24, 2017
e19570e
#29
christiannagel Feb 24, 2017
ee23d1f
#29
christiannagel Feb 24, 2017
5f9105d
#29
christiannagel Feb 24, 2017
6c30128
#29
christiannagel Feb 24, 2017
1fd3006
#27 #29
christiannagel Feb 24, 2017
0f90537
C# 7.0 chapter
christiannagel Mar 3, 2017
7b3b9fd
#27 #29
christiannagel Mar 6, 2017
7fe9a1b
#27 #29
christiannagel Mar 6, 2017
d2a40e6
#27
christiannagel Mar 10, 2017
6b19eaf
Merge pull request #35 from ProfessionalCSharp/master
christiannagel Mar 10, 2017
0eeb2bd
networking samples #27 #29
christiannagel Mar 10, 2017
1b427cd
remove test project
christiannagel Mar 10, 2017
d333208
XML and JSON #27 #29
christiannagel Mar 10, 2017
03eda3a
Web API #27 #29
christiannagel Apr 5, 2017
0875943
ADO.NET #27 #29
christiannagel Apr 5, 2017
8852a94
patterns - package updates
christiannagel Apr 5, 2017
f1be839
update for VS2017
christiannagel Apr 5, 2017
a9fe106
fix csproj
christiannagel Apr 5, 2017
9526617
update unit testing samples
christiannagel Apr 11, 2017
3fba190
ASP.NET #27 #34
christiannagel Apr 11, 2017
d22b1d8
user secrets #34
christiannagel Apr 11, 2017
b60d19b
ASP.NET MVC #27 #29 #34
christiannagel Apr 11, 2017
4eaa537
Entity Framework Core #27 #29
christiannagel Apr 11, 2017
6cb94d5
arrays - remove properties folders
christiannagel Apr 11, 2017
5eafa07
operators and casts - remove properties folders
christiannagel Apr 11, 2017
bf02dfe
delegates - remove properties folders
christiannagel Apr 11, 2017
d2127bd
update readme #36
christiannagel Apr 11, 2017
8258866
collections #29 #36
christiannagel Apr 11, 2017
40f890f
special collections #29 #36
christiannagel Apr 11, 2017
16df170
strings and regular expressions #29 #36
christiannagel Apr 11, 2017
630781a
errors and exceptions #29 #36
christiannagel Apr 11, 2017
15ffc4f
LINQ #36
christiannagel Apr 11, 2017
8ad801a
Async #36
christiannagel Apr 11, 2017
fb1a7cb
reflection and dynamic #29 #36
christiannagel Apr 11, 2017
96e2224
C# 7 solution file
christiannagel Apr 11, 2017
8957e0d
composition #27 #29 #36
christiannagel Apr 12, 2017
5d7618d
testing #27 #36
christiannagel Apr 12, 2017
b07d792
diagnostics #27 #36
christiannagel Apr 12, 2017
6e4ad72
parallel #36
christiannagel Apr 12, 2017
4c542b2
synchronization #29 #36
christiannagel Apr 12, 2017
fe95e95
files and streams #29 #36
christiannagel Apr 12, 2017
08eec69
security #27 #29 #36
christiannagel Apr 13, 2017
41cb952
networking package updates, #36
christiannagel Apr 13, 2017
ad9d2ec
xml and json - package updates, #36
christiannagel Apr 13, 2017
d7ffd37
localization - #27 #29 #36
christiannagel Apr 13, 2017
47416ca
xaml - package updates, #36
christiannagel Apr 13, 2017
895754d
styles and resources - package updates, #36
christiannagel Apr 13, 2017
6849996
patterns - package updates, #36
christiannagel Apr 13, 2017
2449d95
windows apps - package updates, #36
christiannagel Apr 13, 2017
bf3e046
advanced windows apps - package updates, #36
christiannagel Apr 13, 2017
8f9dda4
WPF - package updates, #36
christiannagel Apr 13, 2017
c182f7d
WPF documents #36
christiannagel Apr 13, 2017
c7c5468
Deployment windows #36
christiannagel Apr 13, 2017
c3d3517
ADO.NET #36
christiannagel Apr 13, 2017
8c142cf
EF #36
christiannagel Apr 13, 2017
b8901f6
Services #36
christiannagel Apr 13, 2017
899fc0a
ASP.NET #36
christiannagel Apr 13, 2017
8b2ac93
ASP.NET MVC #36
christiannagel Apr 13, 2017
c222e32
Web API - remove OData, and #36
christiannagel Apr 13, 2017
d372eb7
SignalR and WebHooks - package updates, #36
christiannagel Apr 13, 2017
770439c
WCF - package updates, #36
christiannagel Apr 13, 2017
ae1a683
deployment web #36
christiannagel Apr 13, 2017
2606dfa
readme
christiannagel Apr 13, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions ADONET/ADONetSamples/ADONetSamples.sln
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio 15
VisualStudioVersion = 15.0.26228.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ConnectionSamples", "ConnectionSamples\ConnectionSamples.xproj", "{34B7F9FF-2AC7-45AC-AB9F-A909122435CE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectionSamples", "ConnectionSamples\ConnectionSamples.csproj", "{34B7F9FF-2AC7-45AC-AB9F-A909122435CE}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CommandSamples", "CommandSamples\CommandSamples.xproj", "{761B0AB6-A017-46F1-8DEE-71B979920584}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommandSamples", "CommandSamples\CommandSamples.csproj", "{761B0AB6-A017-46F1-8DEE-71B979920584}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AsyncSamples", "AsyncSamples\AsyncSamples.xproj", "{022F04F8-A133-4F13-8CCC-331A61573B70}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AsyncSamples", "AsyncSamples\AsyncSamples.csproj", "{022F04F8-A133-4F13-8CCC-331A61573B70}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TransactionSamples", "TransactionSamples\TransactionSamples.xproj", "{2FF75228-D5F4-495D-B787-74EC71D9CD33}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TransactionSamples", "TransactionSamples\TransactionSamples.csproj", "{2FF75228-D5F4-495D-B787-74EC71D9CD33}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
14 changes: 14 additions & 0 deletions ADONET/ADONetSamples/AsyncSamples/AsyncSamples.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
<PackageReference Include="System.Data.SqlClient" Version="4.3.0" />
</ItemGroup>

</Project>
18 changes: 0 additions & 18 deletions ADONET/ADONetSamples/AsyncSamples/AsyncSamples.xproj

This file was deleted.

24 changes: 0 additions & 24 deletions ADONET/ADONetSamples/AsyncSamples/project.json

This file was deleted.

14 changes: 14 additions & 0 deletions ADONET/ADONetSamples/CommandSamples/CommandSamples.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
<PackageReference Include="System.Data.SqlClient" Version="4.3.0" />
</ItemGroup>

</Project>
18 changes: 0 additions & 18 deletions ADONET/ADONetSamples/CommandSamples/CommandSamples.xproj

This file was deleted.

24 changes: 0 additions & 24 deletions ADONET/ADONetSamples/CommandSamples/project.json

This file was deleted.

14 changes: 14 additions & 0 deletions ADONET/ADONetSamples/ConnectionSamples/ConnectionSamples.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
<PackageReference Include="System.Data.SqlClient" Version="4.3.0" />
</ItemGroup>

</Project>
18 changes: 0 additions & 18 deletions ADONET/ADONetSamples/ConnectionSamples/ConnectionSamples.xproj

This file was deleted.

24 changes: 0 additions & 24 deletions ADONET/ADONetSamples/ConnectionSamples/project.json

This file was deleted.

14 changes: 14 additions & 0 deletions ADONET/ADONetSamples/TransactionSamples/TransactionSamples.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
<PackageReference Include="System.Data.SqlClient" Version="4.3.0" />
</ItemGroup>

</Project>
18 changes: 0 additions & 18 deletions ADONET/ADONetSamples/TransactionSamples/TransactionSamples.xproj

This file was deleted.

24 changes: 0 additions & 24 deletions ADONET/ADONetSamples/TransactionSamples/project.json

This file was deleted.

12 changes: 10 additions & 2 deletions ADONET/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,13 @@ This chapter contains these samples:

The database that is used with these samples is AdventureWorks. Download AdventureWorks from [CodePlex](https://msftdbprodsamples.codeplex.com).

The current version of this sample is built with .NET Core 1.0 and Preview 2 Tools.
When RTM of the Tools is available, the project files will be updated.
To build and run the .NET Core samples, please install
* Visual Studio 2017 with the .NET Core workload

Please download and install the tools from [.NET Core downloads](https://www.microsoft.com/net/core).

For code comments and issues please check [Professional C#'s GitHub Repository](https://github.com/ProfessionalCSharp/ProfessionalCSharp6)

Please check my blog [csharp.christiannagel.com](https://csharp.christiannagel.com "csharp.christiannagel.com") for additional information for topics covered in the book.

Thank you!
5 changes: 2 additions & 3 deletions ASPNET/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ This chapter contains this sample:
Building this sample starts with an empty ASP.NET Core Web project, and adds many features of ASP.NET Core.

To build and run the .NET Core samples, please install
* Visual Studio 2015 Update 3
* .NET Core 1.1
* Visual Studio 2017 with the .NET Core workload

Please download and install the tools from [.NET Core downloads](https://dot.net).
Please download and install the tools from [.NET Core downloads](https://www.microsoft.com/net/core).

For code comments and issues please check [Professional C#'s GitHub Repository](https://github.com/ProfessionalCSharp/ProfessionalCSharp6)

Expand Down
9 changes: 3 additions & 6 deletions ASPNET/WebSampleApp/WebSampleApp.sln
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26403.3
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6857A15F-1E75-427B-B57A-B2404F87600D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A044A198-AEF6-4477-84B3-198477066FB4}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebSampleApp", "src\WebSampleApp\WebSampleApp.xproj", "{C0804627-0C92-44FD-8795-6DF04B1CCBDE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebSampleApp", "src\WebSampleApp\WebSampleApp.csproj", "{C0804627-0C92-44FD-8795-6DF04B1CCBDE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
6 changes: 0 additions & 6 deletions ASPNET/WebSampleApp/global.json

This file was deleted.

5 changes: 2 additions & 3 deletions ASPNET/WebSampleApp/src/WebSampleApp/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public Startup(IHostingEnvironment env)

if (env.IsDevelopment())
{
builder.AddUserSecrets();
builder.AddUserSecrets<Startup>();
}
Configuration = builder.Build();
}
Expand Down Expand Up @@ -71,8 +71,7 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
{
HomeController controller =
app.ApplicationServices.GetService<HomeController>();
int statusCode = await controller.Index(context);
context.Response.StatusCode = statusCode;
await controller.Index(context);
});
});

Expand Down
33 changes: 33 additions & 0 deletions ASPNET/WebSampleApp/src/WebSampleApp/WebSampleApp.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<UserSecretsId>aspnet-WebSampleApp-20160523063651</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>


<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Session" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
</ItemGroup>

<ItemGroup>
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0" />
</ItemGroup>

</Project>
Loading