Skip to content
This repository was archived by the owner on Sep 11, 2019. It is now read-only.

Commit 25623c1

Browse files
committed
Replace dot history image with markdown table
Add a row on .NET 4.6
1 parent 4428fd3 commit 25623c1

File tree

3 files changed

+38
-1
lines changed

3 files changed

+38
-1
lines changed

slides/1 Basic/custom.css

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
.reveal section table{
2+
width: 1300px;
3+
margin-left: -200px;
4+
}
5+
6+
.reveal section table p {
7+
font-size: 30px;
8+
text-align: center;
9+
}
10+
11+
.reveal section table th:nth-child(1),
12+
.reveal section table th:nth-child(2),
13+
.reveal section table th:nth-child(4){
14+
width: 12%;
15+
}
16+
17+
.reveal section table th:nth-child(3) {
18+
width: 18%;
19+
}
-37.3 KB
Binary file not shown.

slides/1 Basic/index.md

+19-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,25 @@
2020

2121
***
2222
###.NET history
23-
![.NET history](images/dotNet_history.png)
23+
24+
| .NET ver | CLR ver | Release | Dev tool | Features |
25+
|----------|---------|------------|------------------|-------------------------------------------------------------------------|
26+
| 1.0 | 1.0 | 2002-02-13 | VS .NET | C#, VB, BCL |
27+
| 1.1 | 1.1 | 2003-04-24 | VS .NET 2003 | API changes |
28+
| 2.0 | 2.0 | 2005-11-07 | VS 2005 | 64x support, partials, nullable, anonymous methods, iterators, generics |
29+
| 3.0 | 2.0 | 2006-11-06 | Expression Blend | WPF, WCF, WWF |
30+
31+
---
32+
33+
| .NET ver | CLR ver | Release | Dev tool | Features |
34+
|----------|---------|------------|------------------|-------------------------------------------------------------------------|
35+
| 3.5 | 2.0 | 2007-11-19 | VS 2008 | lambda-expressions, LINQ, ASP.NET MVC |
36+
| 4.0 | 4.0 | 2010-04-12 | VS 2010 | TPL, dynamic, code contracts |
37+
| 4.5 | 4.0 | 2012-08-15 | VS 2012 | async/await |
38+
| 4.5.1 | 4.0 | 2013-10-17 | VS 2013 | improvements |
39+
| 4.5.2 | 4.0 | 2014-05-05 | - | High DPI for WinForms |
40+
| 4.6 | 4.0 | 2015-07-20 | VS 2015 | new JIT compiler (RyuJIT), cryptographic enhancements |
41+
2442

2543
***
2644
###.NET key features

0 commit comments

Comments
 (0)