From 5540c8b06f7e4e326def3f92f6dc9a72c5499045 Mon Sep 17 00:00:00 2001 From: Alekhya Reddy Kommuru Date: Fri, 13 Mar 2020 11:25:53 -0700 Subject: [PATCH 1/2] updated README with setup, build launcher and pull code from other repositories --- README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/README.md b/README.md index 95f7e16b7a..32d18f359b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,25 @@ +# Important Instructions \ + +## Steps to build and run launcher successfully +1. Restore the nuget packages +2. Download and install [Windows 10 SDK version 10.0.14393.795](https://go.microsoft.com/fwlink/p/?LinkId=838916). This SDK cannot be installed using the Visual Studio installer. +3. Run powerToys.sln in Debug/Release and x64 configuration. + +## Contribution details + +### To pull code from PowerToys repository + +`cd Launcher`\ +`git remote add public https://github.com/microsoft/PowerToys.git`\ +`git pull public master`\ +`git push origin ` + +### To pull code from Wox repository + +`Git subtree pull --prefix src/modules/launcher https://github.com/jjw24/Wox.git master` + +**NOTE:** Do not use the `--squash` option while pulling changes from the subtree as that would result in all the changes being reflected as made by you, which would tamper the git history. + # Overview From eb535acb9552068f6e3b5f7fec32434c9e437b0e Mon Sep 17 00:00:00 2001 From: Alekhya Reddy Kommuru Date: Fri, 13 Mar 2020 11:29:50 -0700 Subject: [PATCH 2/2] minor modifications in README --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 32d18f359b..675d874b91 100644 --- a/README.md +++ b/README.md @@ -3,20 +3,24 @@ ## Steps to build and run launcher successfully 1. Restore the nuget packages 2. Download and install [Windows 10 SDK version 10.0.14393.795](https://go.microsoft.com/fwlink/p/?LinkId=838916). This SDK cannot be installed using the Visual Studio installer. -3. Run powerToys.sln in Debug/Release and x64 configuration. +3. Build and run PowerToys.sln in Debug/Release mode and x64 configuration. ## Contribution details ### To pull code from PowerToys repository -`cd Launcher`\ -`git remote add public https://github.com/microsoft/PowerToys.git`\ -`git pull public master`\ -`git push origin ` +```powershell +cd Launcher +git remote add public https://github.com/microsoft/PowerToys.git +git pull public master +git push origin +``` ### To pull code from Wox repository -`Git subtree pull --prefix src/modules/launcher https://github.com/jjw24/Wox.git master` +```powerhsell +Git subtree pull --prefix src/modules/launcher https://github.com/jjw24/Wox.git master +``` **NOTE:** Do not use the `--squash` option while pulling changes from the subtree as that would result in all the changes being reflected as made by you, which would tamper the git history.