Update PowerShell sdk to 7-rc.3 to remove the download tasks

Data-Analisis · Feb 24, 2020 · 5129856 · 5129856
1 parent 855911b
commit 5129856
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 25 deletions.
diff --git a/Microsoft.DotNet.Interactive.PowerShell/Microsoft.DotNet.Interactive.PowerShell.csproj b/Microsoft.DotNet.Interactive.PowerShell/Microsoft.DotNet.Interactive.PowerShell.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" InitialTargets="PSRestoreBuiltInModules;GetNuGetPackageRoot">
+<Project Sdk="Microsoft.NET.Sdk" InitialTargets="GetNuGetPackageRoot">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -11,30 +11,11 @@
     <NoWarn>;NU5104;2003;8002</NoWarn>
   </PropertyGroup>
 
-  <!-- Restore the module manifests for built in modules. This is temporary until https://github.com/PowerShell/PowerShell/issues/11783 is fixed. -->
-  <Target Name="PSRestoreBuiltInModules">
-    <PropertyGroup>
-      <PSUtilityUrl>https://raw.githubusercontent.com/PowerShell/PowerShell/v7.0.0-rc.2/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1</PSUtilityUrl>
-      <PSManagementUrl>https://raw.githubusercontent.com/PowerShell/PowerShell/v7.0.0-rc.2/src/Modules/Windows/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1</PSManagementUrl>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <PSUtilityFolder>$(MSBuildProjectDirectory)\Modules\Microsoft.PowerShell.Utility</PSUtilityFolder>
-      <PSManagementFolder>$(MSBuildProjectDirectory)\Modules\Microsoft.PowerShell.Management</PSManagementFolder>
-    </PropertyGroup>
-
-    <MakeDir Directories="$(PSUtilityFolder)" />
-    <MakeDir Directories="$(PSManagementFolder)" />
-
-    <DownloadFile SourceUrl="$(PSUtilityUrl)" DestinationFolder="$(PSUtilityFolder)" />
-    <DownloadFile SourceUrl="$(PSManagementUrl)" DestinationFolder="$(PSManagementFolder)" />
-  </Target>
-
   <!-- PowerShell Module Versions -->
   <PropertyGroup>
     <PackageManagementVersion>1.4.6</PackageManagementVersion>
     <PowerShellGetVersion>2.2.3</PowerShellGetVersion>
-    <MicrosoftPowerShellArchiveVersion>1.2.4</MicrosoftPowerShellArchiveVersion>
+    <MicrosoftPowerShellArchiveVersion>1.2.5</MicrosoftPowerShellArchiveVersion>
     <ThreadJobVersion>2.0.3</ThreadJobVersion>
   </PropertyGroup>
 
@@ -101,8 +82,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.0-rc.2" />
-    <PackageReference Include="FSharp.Core" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.0-rc.3" />
     <PackageReference Include="XPlot.Plotly" Version="3.0.1" />
   </ItemGroup>
 

diff --git a/...ules/Microsoft.DotNet.Interactive.PowerShell/Microsoft.DotNet.Interactive.PowerShell.psd1 b/...ules/Microsoft.DotNet.Interactive.PowerShell/Microsoft.DotNet.Interactive.PowerShell.psd1
@@ -60,7 +60,7 @@ CmdletsToExport = @(
 )
 
 # Variables to export from this module
-VariablesToExport = '*'
+VariablesToExport = @()
 
 # Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
 AliasesToExport = @(

diff --git a/Microsoft.DotNet.Interactive.PowerShell/PowerShellKernel.cs b/Microsoft.DotNet.Interactive.PowerShell/PowerShellKernel.cs
@@ -52,7 +52,7 @@ public PowerShellKernel()
                 Environment.SetEnvironmentVariable("POWERSHELL_DISTRIBUTION_CHANNEL", "dotnet-interactive-powershell");
 
                 // Create PowerShell instance
-                var iss = InitialSessionState.CreateDefault();
+                var iss = InitialSessionState.CreateDefault2();
                 if(Platform.IsWindows)
                 {
                     // This sets the execution policy on Windows to RemoteSigned.

diff --git a/eng/Signing.props b/eng/Signing.props
@@ -15,6 +15,35 @@
 
     <!-- PowerShell Modules that are shipped with the PowerShell subkernel -->
 
+    <!-- CimCmdlets -->
+    <FileSignInfo Include="CimCmdlets.psd1" CertificateName="None" />
+
+    <!-- Microsoft.PowerShell.Diagnostics -->
+    <FileSignInfo Include="Microsoft.PowerShell.Diagnostics.psd1" CertificateName="None" />
+    <FileSignInfo Include="Diagnostics.format.ps1xml" CertificateName="None" />
+    <FileSignInfo Include="Event.format.ps1xml" CertificateName="None" />
+    <FileSignInfo Include="GetEvent.types.ps1xml" CertificateName="None" />
+
+    <!-- Microsoft.PowerShell.Host -->
+    <FileSignInfo Include="Microsoft.PowerShell.Host.psd1" CertificateName="None" />
+
+    <!-- Microsoft.PowerShell.Management -->
+    <FileSignInfo Include="Microsoft.PowerShell.Management.psd1" CertificateName="None" />
+
+    <!-- Microsoft.PowerShell.Security -->
+    <FileSignInfo Include="Microsoft.PowerShell.Security.psd1" CertificateName="None" />
+
+    <!-- Microsoft.PowerShell.Utility -->
+    <FileSignInfo Include="Microsoft.PowerShell.Utility.psd1" CertificateName="None" />
+
+    <!-- Microsoft.WSMan.Management -->
+    <FileSignInfo Include="Microsoft.WSMan.Management.psd1" CertificateName="None" />
+    <FileSignInfo Include="WSMan.format.ps1xml" CertificateName="None" />
+
+    <!-- PSDiagnostics -->
+    <FileSignInfo Include="PSDiagnostics.psd1" CertificateName="None" />
+    <FileSignInfo Include="PSDiagnostics.psm1" CertificateName="None" />
+
     <!-- Microsoft.PowerShell.Archive -->
     <FileSignInfo Include="Microsoft.PowerShell.Archive.cat" CertificateName="None" />
     <FileSignInfo Include="Microsoft.PowerShell.Archive.psd1" CertificateName="None" />