Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 8d17329

Browse files
author
gumme
committed
Merge remote-tracking branch 'upstream/master'
Conflicts: src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignPanel.cs
2 parents 22ff94b + 929fc8e commit 8d17329

129 files changed

Lines changed: 1470 additions & 4165 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ If you want to contribute see ["Joining the team"](https://github.com/icsharpcod
2626

2727
##Extended Requirements (building #Develop)
2828

29-
- [Microsoft Build Tools 2013](www.microsoft.com/en-us/download/details.aspx?id=40760)
29+
- [Microsoft Build Tools 2013](http://www.microsoft.com/en-us/download/details.aspx?id=40760)
3030
- [.NET 3.5 SP1](http://www.microsoft.com/en-au/download/details.aspx?id=22)
31-
- [.NET 4.5 SDK] (part of [Windows SDK 8.0](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx))
32-
- [Windows SDK 7.1](http://www.microsoft.com/downloads/details.aspx?familyid=6B6C21D2-2006-4AFA-9702-529FA782D63B) (?? not sure if this still is necessary...)
31+
- [.NET 4.5 SDK](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx) (part of Windows SDK 8.0)
32+
- [Windows SDK 7.1](http://www.microsoft.com/downloads/details.aspx?familyid=6B6C21D2-2006-4AFA-9702-529FA782D63B)
3333
- [Windows SDK 7.0](http://www.microsoft.com/en-us/download/details.aspx?id=3138) (optional; C++ compiler needed for profiler)
3434
- [Windows PowerShell](http://www.microsoft.com/en-us/download/details.aspx?id=34595)
3535
- If you have cloned the SD git repository: git must be available on your PATH

doc/Dependencies.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ul>
1212
<li>
13-
<a href="http://www.microsoft.com/en-us/download/details.aspx?id=40772">Microsoft .NET Framework 4.5.1 Developer Pack</a> for .NET 4.5 code completion documentation
13+
<a href="http://www.microsoft.com/en-us/download/details.aspx?id=42637">Microsoft .NET Framework 4.5.2 Developer Pack</a> for .NET 4.5 code completion documentation
1414
</li>
1515
<li>
1616
<a href="http://www.microsoft.com/downloads/details.aspx?familyid=6B6C21D2-2006-4AFA-9702-529FA782D63B&amp;displaylang=en">Microsoft Windows SDK for Windows 7 and .NET Framework 4</a> (strongly recommended!)
@@ -47,6 +47,10 @@
4747
<th>Target platform</th>
4848
<th>Reference Assemblies</th>
4949
<tr>
50+
<tr>
51+
<td>.NET Framework 4.5.2</td>
52+
<td><a href="http://www.microsoft.com/en-us/download/details.aspx?id=42637">Microsoft .NET Framework 4.5.2 Developer Pack</a></td>
53+
</tr>
5054
<tr>
5155
<td>.NET Framework 4.5.1</td>
5256
<td><a href="http://www.microsoft.com/en-us/download/details.aspx?id=40772">Microsoft .NET Framework 4.5.1 Developer Pack</a></td>

samples/SharpDevelopReports/SampleReports/Customized/EventLog.srd

Lines changed: 0 additions & 292 deletions
This file was deleted.
-298 Bytes
Binary file not shown.
-310 Bytes
Binary file not shown.
-273 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)