diff --git a/README.md b/README.md index 53c99d3..3b500df 100644 --- a/README.md +++ b/README.md @@ -42,10 +42,11 @@ To run a recipe script, click a link in the table below from your target machine |Click link to run |Description | |---------|---------| -|Desktop App | Windows Desktop App Development (Visual Studio, Windows SDK) | -|Web | Web (VS Code, WSL, Multiple Browsers) | -|Web NodeJS | Web Dev with NodeJS (Web + NodeJS LTS)¹ | -|Machine Learning| Machine Learning (Python, WSL, VS Code) | +|Desktop App | Windows Desktop App Development (Visual Studio, Windows SDK) | +|Web | Web (VS Code, WSL, Multiple Browsers) | +|Web NodeJS | Web Dev with NodeJS (Web + NodeJS LTS)¹ | +|Machine Learning Windows| Machine Learning with only Windows native tools | +|Machine Learning Linux| Machine Learning with Linux tools running on WSL | | | Xamarin (Visual Studio, Xamarin, Android SDK) | | | Containers (Docker, Kubernetes, etc...) | | | More Coming Soon! | diff --git a/dev_app.ps1 b/dev_app.ps1 index 8c2bddc..f5e8b54 100644 --- a/dev_app.ps1 +++ b/dev_app.ps1 @@ -32,7 +32,7 @@ executeScript "CommonDevTools.ps1"; # visualstudio2017enterprise choco install visualstudio2017community -y --package-parameters "--add Microsoft.VisualStudio.Component.Git" -RefreshEnv #refreshing env due to Git install +Update-SessionEnvironment #refreshing env due to Git install #--- UWP Workload and installing Windows Template Studio --- choco install -y visualstudio2017-workload-azure diff --git a/dev_ml_python.ps1 b/dev_ml_windows.ps1 similarity index 85% rename from dev_ml_python.ps1 rename to dev_ml_windows.ps1 index f34f68d..469282a 100644 --- a/dev_ml_python.ps1 +++ b/dev_ml_windows.ps1 @@ -1,29 +1,28 @@ -# Description: Boxstarter Script -# Author: Microsoft -# Common dev settings for machine learning - -Disable-UAC - -# see if we can't get calling URL somehow, that would eliminate this need -# should move to a config file -$user = "Microsoft"; -$baseBranch = "master"; -$finalBaseHelperUri = "https://raw.githubusercontent.com/$user/windows-dev-box-setup-scripts/$baseBranch/scripts"; - -function executeScript { - Param ([string]$script) - write-host "executing $finalBaseHelperUri/$script ..." - iex ((new-object net.webclient).DownloadString("$finalBaseHelperUri/$script")) -} - -#--- Setting up Windows --- -executeScript "SystemConfiguration.ps1"; -executeScript "FileExplorerSettings.ps1"; -executeScript "RemoveDefaultApps.ps1"; -executeScript "GetMLIDEAndTooling.ps1"; -executeScript "VirtualizationTools.ps1"; -executeScript "PythonMLTools.ps1"; - -Enable-UAC -Enable-MicrosoftUpdate -Install-WindowsUpdate -acceptEula +# Description: Boxstarter Script +# Author: Microsoft +# Common dev settings for machine learning using only Windows native tools + +Disable-UAC + +# see if we can't get calling URL somehow, that would eliminate this need +# should move to a config file +$user = "Microsoft"; +$baseBranch = "MLSamples"; +$finalBaseHelperUri = "https://raw.githubusercontent.com/$user/windows-dev-box-setup-scripts/$baseBranch/scripts"; + +function executeScript { + Param ([string]$script) + write-host "executing $finalBaseHelperUri/$script ..." + iex ((new-object net.webclient).DownloadString("$finalBaseHelperUri/$script")) +} + +#--- Setting up Windows --- +executeScript "SystemConfiguration.ps1"; +executeScript "FileExplorerSettings.ps1"; +executeScript "RemoveDefaultApps.ps1"; +executeScript "GetMLIDEAndTooling.ps1"; +executeScript "PythonMLTools.ps1"; + +Enable-UAC +Enable-MicrosoftUpdate +Install-WindowsUpdate -acceptEula diff --git a/dev_ml_wsl.ps1 b/dev_ml_wsl.ps1 new file mode 100644 index 0000000..0ed3ba4 --- /dev/null +++ b/dev_ml_wsl.ps1 @@ -0,0 +1,40 @@ +# Description: Boxstarter Script +# Author: Microsoft +# Common dev settings for machine learning using Windows and Linux native tools + +Disable-UAC + +# Get the base URI path from the ScriptToCall value +$bstrappackage = "-bootstrapPackage" +$Boxstarter | Foreach-Object { write-host "The key name is $_.Key and value is $_.Value" } + +$helperUri = $Boxstarter['ScriptToCall'] +write-host "ScriptToCall is $helperUri" + +$strpos = $helperUri.IndexOf($bstrappackage) +$helperUri = $helperUri.Substring($strpos + $bstrappackage.Length) +$helperUri = $helperUri.TrimStart("'", " ") +$helperUri = $helperUri.TrimEnd("'", " ") +$helperUri = $helperUri.Substring(0, $helperUri.LastIndexOf("/")) +$helperUri += "/scripts" +write-host "helper script base URI is $helperUri" + +function executeScript { + Param ([string]$script) + write-host "executing $helperUri/$script ..." + iex ((new-object net.webclient).DownloadString("$helperUri/$script")) +} + +#--- Setting up Windows --- +executeScript "SystemConfiguration.ps1"; +executeScript "FileExplorerSettings.ps1"; +executeScript "RemoveDefaultApps.ps1"; +executeScript "CommonDevTools.ps1"; +executeScript "VirtualizationTools.ps1"; +executeScript "GetMLPythonSamplesOffGithub.ps1"; + +# TODO: now install additional ML tools inside the WSL distro once default user w/blank password is working + +Enable-UAC +Enable-MicrosoftUpdate +Install-WindowsUpdate -acceptEula diff --git a/scripts/GetMLPythonSamplesOffGithub.ps1 b/scripts/GetMLPythonSamplesOffGithub.ps1 new file mode 100644 index 0000000..60969c7 --- /dev/null +++ b/scripts/GetMLPythonSamplesOffGithub.ps1 @@ -0,0 +1,6 @@ + +write-host "Downloading Python ML samples to your desktop ..." + +Update-SessionEnvironment +cd $env:USERPROFILE\desktop +git clone https://github.com/Microsoft/Dev-Advocacy-Samples/tree/master/python-mlclassification diff --git a/scripts/GetUwpSamplesOffGithub.ps1 b/scripts/GetUwpSamplesOffGithub.ps1 index 5a7e8de..c810854 100644 --- a/scripts/GetUwpSamplesOffGithub.ps1 +++ b/scripts/GetUwpSamplesOffGithub.ps1 @@ -1,4 +1,4 @@ -RefreshEnv +Update-SessionEnvironment cd $env:USERPROFILE\desktop mkdir UwpSamples cd UwpSamples diff --git a/scripts/RemoveDefaultApps.ps1 b/scripts/RemoveDefaultApps.ps1 index 4f64b2b..7b2a48d 100644 --- a/scripts/RemoveDefaultApps.ps1 +++ b/scripts/RemoveDefaultApps.ps1 @@ -1,5 +1,5 @@ #--- Uninstall unecessary applications that come with Windows out of the box --- -Write-Host "Uninstall unecessary applications that come with Windows out of the box" -ForegroundColor "Yellow" +Write-Host "Uninstall some applications that come with Windows out of the box" -ForegroundColor "Yellow" #Referenced to build script # https://docs.microsoft.com/en-us/windows/application-management/remove-provisioned-apps-during-update @@ -32,7 +32,6 @@ $applicationList = @( "Microsoft.MicrosoftOfficeHub" "Microsoft.OneConnect" "Microsoft.WindowsPhone" - "Microsoft.SkypeApp" "Microsoft.WindowsSoundRecorder" "*Solitaire*" "Microsoft.MicrosoftStickyNotes" @@ -44,13 +43,10 @@ $applicationList = @( "Microsoft.NetworkSpeedTest" "Microsoft.FreshPaint" "Microsoft.Print3D" - - #Non-Microsoft "*Autodesk*" "*BubbleWitch*" "king.com.CandyCrush*" "*Dell*" - "*Dropbox*" "*Facebook*" "*Keeper*" "*Netflix*" diff --git a/scripts/VirtualizationTools.ps1 b/scripts/VirtualizationTools.ps1 index c730575..31eeb7e 100644 --- a/scripts/VirtualizationTools.ps1 +++ b/scripts/VirtualizationTools.ps1 @@ -8,9 +8,11 @@ choco install -y vscode-docker #--- Ubuntu --- -Invoke-WebRequest -Uri https://aka.ms/wsl-ubuntu-1604 -OutFile ~/Ubuntu.appx -UseBasicParsing +Invoke-WebRequest -Uri https://aka.ms/wsl-ubuntu-1804 -OutFile ~/Ubuntu.appx -UseBasicParsing Add-AppxPackage -Path ~/Ubuntu.appx +# TODO reboot here + <# #--- SLES --- # Install SLES Store app