From dcfe504fdac3022ab81197db35ad2d484aa14191 Mon Sep 17 00:00:00 2001 From: Kyle Sferrazza Date: Mon, 9 Oct 2017 18:33:36 -0400 Subject: [PATCH 1/3] Use new S.M.A. dll for build instructions --- docs/building/internals.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/building/internals.md b/docs/building/internals.md index 1252b72c081..c71f8c7b461 100644 --- a/docs/building/internals.md +++ b/docs/building/internals.md @@ -70,7 +70,7 @@ The necessary steps can be run manually: ```sh cd ../TypeCatalogGen dotnet restore -dotnet run ../Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CorePsTypeCatalog.cs powershell.inc +dotnet run ../System.Management.Automation/CoreCLR/CorePsTypeCatalog.cs powershell.inc ``` The file `powershell.inc` is generated by running a custom MSBuild target, From 92dd70e2b0f8dd230d3e8db09e0ce5fb9c0079c2 Mon Sep 17 00:00:00 2001 From: Kyle Sferrazza Date: Mon, 9 Oct 2017 18:36:07 -0400 Subject: [PATCH 2/3] Include custom build target in internals.md - build.sh no longer exists --- docs/building/internals.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/docs/building/internals.md b/docs/building/internals.md index c71f8c7b461..a5c0c550657 100644 --- a/docs/building/internals.md +++ b/docs/building/internals.md @@ -74,7 +74,24 @@ dotnet run ../System.Management.Automation/CoreCLR/CorePsTypeCatalog.cs powershe ``` The file `powershell.inc` is generated by running a custom MSBuild target, -which can be found at [`build.sh`](../../build.sh#L15). +which can be set-up by navigating to the ```src``` directory and running the following commands: + +```sh +targetFile="Microsoft.PowerShell.SDK/obj/Microsoft.PowerShell.SDK.csproj.TypeCatalog.targets" +cat > $targetFile <<-"EOF" + + + + <_RefAssemblyPath Include="%(_ReferencesFromRAR.ResolvedPath)%3B" Condition=" '%(_ReferencesFromRAR.Type)' == 'assembly' And '%(_ReferencesFromRAR.PackageName)' != 'Microsoft.Management.Infrastructure' " /> + + + + +EOF +dotnet msbuild Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj /t:_GetDependencies "/property:DesignTimeBuild=true;_DependencyFile=$(pwd)/src/TypeCatalogGen/powershell.inc" /nologo +``` + `powershell.inc` contains the resolved paths to the DLLs of each dependency of PowerShell, and is taken as input to the [`TypeCatalogGen`](../../src/TypeCatalogGen) tool, which generates a source file `CorePsTypeCatalog.cs` for the `Microsoft.PowerShell.CoreCLR.AssemblyLoadContext` project. From 695831b914bd679e32b8f509670fa75ce454fdb5 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Wed, 11 Oct 2017 17:40:08 -0700 Subject: [PATCH 3/3] Replace "```src```" with "`src`" --- docs/building/internals.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/building/internals.md b/docs/building/internals.md index a5c0c550657..6ab7fc33276 100644 --- a/docs/building/internals.md +++ b/docs/building/internals.md @@ -74,7 +74,7 @@ dotnet run ../System.Management.Automation/CoreCLR/CorePsTypeCatalog.cs powershe ``` The file `powershell.inc` is generated by running a custom MSBuild target, -which can be set-up by navigating to the ```src``` directory and running the following commands: +which can be set-up by navigating to the `src` directory and running the following commands: ```sh targetFile="Microsoft.PowerShell.SDK/obj/Microsoft.PowerShell.SDK.csproj.TypeCatalog.targets"