From e84c3ae04c5623f6cc4b6fe9f78ba3848301033c Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Tue, 1 Oct 2019 13:38:32 +0200 Subject: [PATCH 1/3] Work on issue #1729 --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 71d46c53e..62ed6d9e8 100644 --- a/README.md +++ b/README.md @@ -48,13 +48,11 @@ How to build ------------ Windows: -- Install Visual Studio (minimum version: 2019.2) with the following components: - - Workload ".NET Desktop Development" - - .NET Framework 4.6.2 Targeting Pack (if the VS installer does not offer this option, install the [.NET 4.6.2 developer pack](https://www.microsoft.com/en-us/download/details.aspx?id=53321) separately) +- Install Visual Studio (documented version: 16.3) with the following components: + - Workload ".NET Desktop Development". This includes by default .NET Framework 4.8 SDK and the .NET Framework 4.7.2 targeting pack, as well as the .NET Core 3 SDK (ILSpy.csproj targets .NET 4.7.2 and uses SDK-style project files across ILSpy.sln). + - Workload "Visual Studio extension development" (ILSpy.sln contains a VS extension project) - Individual Component "MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.22)" (or similar) - The VC++ toolset is optional; if present it is used for `editbin.exe` to modify the stack size used by ILSpy.exe from 1MB to 16MB, because the decompiler makes heavy use of recursion, where small stack sizes lead to problems in very complex methods. -- Install the [.NET Core SDK 2.2](https://dotnet.microsoft.com/download) -- Install the [.NET Core SDK 3](https://dotnet.microsoft.com/download/dotnet-core) - Check out the ILSpy repository using git. - Execute `git submodule update --init --recursive` to download the ILSpy-Tests submodule (used by some test cases). - Open ILSpy.sln in Visual Studio. @@ -63,11 +61,11 @@ Windows: - Use the Visual Studio "Test Explorer" to see/run the tests Unix: -- Make sure .NET Core 2.2 is installed (you can get it here: https://get.dot.net). +- Make sure .NET Core 2.1 LTS Runtime is installed (you can get it here: https://get.dot.net). - Make sure [.NET Core SDK 3](https://dotnet.microsoft.com/download/dotnet-core) is installed. - Check out the repository using git. - Execute `git submodule update --init --recursive` to download the ILSpy-Tests submodule (used by some test cases). -- Use `dotnet build Frontends.sln` to build the non-Windows flavors of ILSpy (cli and powershell core). +- Use `dotnet build Frontends.sln` to build the non-Windows flavors of ILSpy (.NET Core Global Tool and PowerShell Core). (Visual Studio for Mac users only:) - Edit `\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj` From 5963f737bc6984c32bb8cfd883ef9a0f5a9e4a89 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Tue, 1 Oct 2019 13:39:36 +0200 Subject: [PATCH 2/3] Pull request #1728 obsoletes the note for Mac users --- README.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/README.md b/README.md index 62ed6d9e8..17b8f787f 100644 --- a/README.md +++ b/README.md @@ -60,20 +60,13 @@ Windows: - Run project "ILSpy" for the ILSpy UI - Use the Visual Studio "Test Explorer" to see/run the tests -Unix: +Unix / Mac: - Make sure .NET Core 2.1 LTS Runtime is installed (you can get it here: https://get.dot.net). - Make sure [.NET Core SDK 3](https://dotnet.microsoft.com/download/dotnet-core) is installed. - Check out the repository using git. - Execute `git submodule update --init --recursive` to download the ILSpy-Tests submodule (used by some test cases). - Use `dotnet build Frontends.sln` to build the non-Windows flavors of ILSpy (.NET Core Global Tool and PowerShell Core). -(Visual Studio for Mac users only:) -- Edit `\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj` - Add `Sdk="Microsoft.NET.Sdk"` to the `Project` element. - This is required due to a tooling issue. - Please do not commit this when contributing a pull request! -- Use Frontends.sln to work. - How to contribute ----------------- From b479d15c915eb01f089f55b8b8603c0121053090 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Tue, 1 Oct 2019 13:46:15 +0200 Subject: [PATCH 3/3] MSVC tooling version update, wording --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 17b8f787f..87283a0b0 100644 --- a/README.md +++ b/README.md @@ -49,9 +49,9 @@ How to build Windows: - Install Visual Studio (documented version: 16.3) with the following components: - - Workload ".NET Desktop Development". This includes by default .NET Framework 4.8 SDK and the .NET Framework 4.7.2 targeting pack, as well as the .NET Core 3 SDK (ILSpy.csproj targets .NET 4.7.2 and uses SDK-style project files across ILSpy.sln). + - Workload ".NET Desktop Development". This includes by default .NET Framework 4.8 SDK and the .NET Framework 4.7.2 targeting pack, as well as the .NET Core 3 SDK (ILSpy.csproj targets .NET 4.7.2, and ILSpy.sln uses SDK-style projects). - Workload "Visual Studio extension development" (ILSpy.sln contains a VS extension project) - - Individual Component "MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.22)" (or similar) + - Individual Component "MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.23)" (or similar) - The VC++ toolset is optional; if present it is used for `editbin.exe` to modify the stack size used by ILSpy.exe from 1MB to 16MB, because the decompiler makes heavy use of recursion, where small stack sizes lead to problems in very complex methods. - Check out the ILSpy repository using git. - Execute `git submodule update --init --recursive` to download the ILSpy-Tests submodule (used by some test cases). @@ -62,7 +62,7 @@ Windows: Unix / Mac: - Make sure .NET Core 2.1 LTS Runtime is installed (you can get it here: https://get.dot.net). -- Make sure [.NET Core SDK 3](https://dotnet.microsoft.com/download/dotnet-core) is installed. +- Make sure [.NET Core 3 SDK](https://dotnet.microsoft.com/download/dotnet-core) is installed. - Check out the repository using git. - Execute `git submodule update --init --recursive` to download the ILSpy-Tests submodule (used by some test cases). - Use `dotnet build Frontends.sln` to build the non-Windows flavors of ILSpy (.NET Core Global Tool and PowerShell Core).