From 1fee37962153c07149bd8a8a9ac509793a8f2807 Mon Sep 17 00:00:00 2001 From: Linus <67926131+libewa@users.noreply.github.com> Date: Fri, 18 Aug 2023 09:17:54 +0200 Subject: [PATCH 1/6] change windows "app store" to microsoft store --- getting-started/_installing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getting-started/_installing.md b/getting-started/_installing.md index 10e9439d1..2aed3730f 100644 --- a/getting-started/_installing.md +++ b/getting-started/_installing.md @@ -69,7 +69,7 @@ In order to develop applications, particularly with the Swift Package Manager, y ##### Install using the Windows Package Manager -The [Windows Package Manager](https://docs.microsoft.com/windows/package-manager/) can be found in the [App Store](https://www.microsoft.com/en-us/p/app-installer/9nblggh4nns1) or be [installed directly](ms-appinstaller:?source=https://aka.ms/getwinget). +The [Windows Package Manager](https://docs.microsoft.com/windows/package-manager/) can be found in the [Microsoft Store](https://www.microsoft.com/en-us/p/app-installer/9nblggh4nns1) or be [installed directly](ms-appinstaller:?source=https://aka.ms/getwinget). #### Install using Scoop From 3c92ce9af8e0e0f42c055e18a24354c6653a71b7 Mon Sep 17 00:00:00 2001 From: Linus <67926131+libewa@users.noreply.github.com> Date: Fri, 18 Aug 2023 09:23:56 +0200 Subject: [PATCH 2/6] ditto --- download/_windows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download/_windows.md b/download/_windows.md index ec04c9120..cc536a748 100644 --- a/download/_windows.md +++ b/download/_windows.md @@ -20,7 +20,7 @@ Windows has the following additional platform specific dependencies: #### Install using the Windows Package Manager -The [Windows Package Manager](https://docs.microsoft.com/windows/package-manager/) can be found in the [App Store](https://www.microsoft.com/en-us/p/app-installer/9nblggh4nns1) or be [installed directly](ms-appinstaller:?source=https://aka.ms/getwinget). +The [Windows Package Manager](https://docs.microsoft.com/windows/package-manager/) can be found in the [Microsoft Store](https://www.microsoft.com/en-us/p/app-installer/9nblggh4nns1) or be [installed directly](ms-appinstaller:?source=https://aka.ms/getwinget). #### Install using Scoop From 43930f19e8ab42a27931d969d53663b5db216ce2 Mon Sep 17 00:00:00 2001 From: Linus <67926131+libewa@users.noreply.github.com> Date: Fri, 18 Aug 2023 09:28:38 +0200 Subject: [PATCH 3/6] remove start /w for windows --- getting-started/_installing.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/getting-started/_installing.md b/getting-started/_installing.md index 2aed3730f..a8d00033d 100644 --- a/getting-started/_installing.md +++ b/getting-started/_installing.md @@ -90,10 +90,7 @@ Invoke-RestMethod -Url 'get.scoop.sh' | Invoke-Expression winget install Python.Python.3.10 curl -sOL https://aka.ms/vs/16/release/vs_community.exe - start /w vs_community.exe --passive --wait --norestart --nocache ^ - --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community" ^ - --add Microsoft.VisualStudio.Component.Windows10SDK.19041 ^ - --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 + start /w vs_community.exe --passive --wait --norestart --nocache --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community" --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 del /q vs_community.exe ~~~ @@ -104,10 +101,7 @@ Invoke-RestMethod -Url 'get.scoop.sh' | Invoke-Expression scoop install python310 curl -sOL https://aka.ms/vs/16/release/vs_community.exe - start /w vs_community.exe --passive --wait --norestart --nocache ^ - --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community" ^ - --add Microsoft.VisualStudio.Component.Windows10SDK.19041 ^ - --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 + start /w vs_community.exe --passive --wait --norestart --nocache --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community" --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 del /q vs_community.exe ~~~ From 4b2f146bd2ec78234ef4287bcba9051897338601 Mon Sep 17 00:00:00 2001 From: Linus <67926131+libewa@users.noreply.github.com> Date: Fri, 18 Aug 2023 09:36:20 +0200 Subject: [PATCH 4/6] forgor to remove the actual start command --- getting-started/_installing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/getting-started/_installing.md b/getting-started/_installing.md index a8d00033d..0ad4d36a1 100644 --- a/getting-started/_installing.md +++ b/getting-started/_installing.md @@ -90,7 +90,7 @@ Invoke-RestMethod -Url 'get.scoop.sh' | Invoke-Expression winget install Python.Python.3.10 curl -sOL https://aka.ms/vs/16/release/vs_community.exe - start /w vs_community.exe --passive --wait --norestart --nocache --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community" --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 + vs_community.exe --passive --wait --norestart --nocache --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community" --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 del /q vs_community.exe ~~~ @@ -101,7 +101,7 @@ Invoke-RestMethod -Url 'get.scoop.sh' | Invoke-Expression scoop install python310 curl -sOL https://aka.ms/vs/16/release/vs_community.exe - start /w vs_community.exe --passive --wait --norestart --nocache --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community" --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 + vs_community.exe --passive --wait --norestart --nocache --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community" --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 del /q vs_community.exe ~~~ From c31b50b1dc63ed3a869602d12a24c0717729a09c Mon Sep 17 00:00:00 2001 From: Linus Warnatz Date: Fri, 18 Aug 2023 16:57:35 +0200 Subject: [PATCH 5/6] install vs using winget when used, else use start --- download/_windows.md | 11 +++++------ getting-started/_installing.md | 13 ++++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/download/_windows.md b/download/_windows.md index cc536a748..9e261de10 100644 --- a/download/_windows.md +++ b/download/_windows.md @@ -36,20 +36,19 @@ Invoke-RestMethod -Url 'get.scoop.sh' | Invoke-Expression The platform dependencies cannot be installed through the Windows Package Manager as the install rules do not install the components necessary. They will be installed through Visual Studio installer. #### With Winget (Windows Package Manager): - ~~~ pwsh + ~~~ cmd winget install Git.Git winget install Python.Python.3.10 curl -sOL https://aka.ms/vs/16/release/vs_community.exe - start /w vs_community.exe --passive --wait --norestart --nocache ^ - --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community" ^ - --add Microsoft.VisualStudio.Component.Windows10SDK.19041 ^ - --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 + winget install Microsoft.VisualStudio.2019.Community --force --custom "--add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64" del /q vs_community.exe ~~~ #### With Scoop: - ~~~ pwsh + > **NOTE:** This code snippet MUST be run in a traditional Command Prompt (`cmd.exe`) + + ~~~ cmd # Scoop already comes pre-installed with Git, so no need to re-install it. scoop bucket add versions scoop install python310 diff --git a/getting-started/_installing.md b/getting-started/_installing.md index 0ad4d36a1..25d194db6 100644 --- a/getting-started/_installing.md +++ b/getting-started/_installing.md @@ -82,26 +82,29 @@ Invoke-RestMethod -Url 'get.scoop.sh' | Invoke-Expression 0. Install required dependencies: - The platform dependencies cannot be installed through the currently supported package managers as the install rules do not install the components necessary. They will be installed through Visual Studio installer. + The platform dependencies cannot be installed through the currently supported package managers as the install rules do not install the components necessary. They will be installed through the Visual Studio installer. #### With Winget (Windows Package Manager): - ~~~ pwsh + ~~~ cmd winget install Git.Git winget install Python.Python.3.10 curl -sOL https://aka.ms/vs/16/release/vs_community.exe - vs_community.exe --passive --wait --norestart --nocache --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community" --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 + winget install Microsoft.VisualStudio.2019.Community --force --custom "--add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64" del /q vs_community.exe ~~~ + #### With Scoop: - ~~~ pwsh + > **NOTE:** This code snippet MUST be run in a traditional Command Prompt (`cmd.exe`) + + ~~~ cmd # Scoop already comes pre-installed with Git, so no need to re-install it. scoop bucket add versions scoop install python310 curl -sOL https://aka.ms/vs/16/release/vs_community.exe - vs_community.exe --passive --wait --norestart --nocache --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community" --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 + start /w vs_community.exe --passive --wait --norestart --nocache --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community" --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 del /q vs_community.exe ~~~ From 344e45ead89ff856e82985545640c8c8c8c390ff Mon Sep 17 00:00:00 2001 From: Linus Warnatz Date: Fri, 18 Aug 2023 17:03:33 +0200 Subject: [PATCH 6/6] we don't need no downloading the vs installer --- download/_windows.md | 3 --- getting-started/_installing.md | 3 --- 2 files changed, 6 deletions(-) diff --git a/download/_windows.md b/download/_windows.md index 9e261de10..e0c2a83d8 100644 --- a/download/_windows.md +++ b/download/_windows.md @@ -39,10 +39,7 @@ Invoke-RestMethod -Url 'get.scoop.sh' | Invoke-Expression ~~~ cmd winget install Git.Git winget install Python.Python.3.10 - - curl -sOL https://aka.ms/vs/16/release/vs_community.exe winget install Microsoft.VisualStudio.2019.Community --force --custom "--add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64" - del /q vs_community.exe ~~~ #### With Scoop: diff --git a/getting-started/_installing.md b/getting-started/_installing.md index 25d194db6..dd6ce9264 100644 --- a/getting-started/_installing.md +++ b/getting-started/_installing.md @@ -89,11 +89,8 @@ Invoke-RestMethod -Url 'get.scoop.sh' | Invoke-Expression winget install Git.Git winget install Python.Python.3.10 - curl -sOL https://aka.ms/vs/16/release/vs_community.exe winget install Microsoft.VisualStudio.2019.Community --force --custom "--add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64" - del /q vs_community.exe ~~~ - #### With Scoop: > **NOTE:** This code snippet MUST be run in a traditional Command Prompt (`cmd.exe`)