Merge branch 'main' into remove-buildalyzer-with-cache-file

dotnet · Aug 10, 2023 · cc3989b · cc3989b
2 parents 4c85b91 + d1effcc
commit cc3989b
Show file tree

Hide file tree

Showing 52 changed files with 1,673 additions and 959 deletions.
diff --git a/.github/release.yml b/.github/release.yml
@@ -23,6 +23,9 @@ changelog:
     - title: Area-Auth
       labels:
         - Area-Auth
+    - title: Area-API
+      labels:
+        - Area-API
     - title: Area-C#
       labels:
         - Area-C#

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -17,7 +17,7 @@
   <PropertyGroup>
     <MicrosoftNETTestSdkVersion>17.4.0</MicrosoftNETTestSdkVersion>
     <NewtonsoftJsonVersion>13.0.2</NewtonsoftJsonVersion>
-    <MicrosoftCodeAnalysisCommonVersion>4.5.0</MicrosoftCodeAnalysisCommonVersion>
+    <MicrosoftCodeAnalysisCommonVersion>4.6.0</MicrosoftCodeAnalysisCommonVersion>
     <SystemDrawingCommonVersion>7.0.0</SystemDrawingCommonVersion>
     <SystemReactiveVersion>6.0.0</SystemReactiveVersion>
     <SystemSecurityCryptographyXmlVersion>7.0.0</SystemSecurityCryptographyXmlVersion>

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ The multi-language experience of .NET Interactive is truly a collaborative effor
 
 - **PowerShell Team:** PowerShell support
 - **Azure Data Team:** SQL and KQL support
-- **Azure Notebooks Team**: Python, R, and Jupyter subkernel support (coming soon...)
+- **Azure Notebooks Team**: Python, R, and Jupyter subkernel support
 
 ## Telemetry
 

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23370.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23408.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c9c125ccc43361cd94433c2d7f7069d465ad11a5</Sha>
+      <Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/publish/PublishVSCodeExtension.ps1 b/eng/publish/PublishVSCodeExtension.ps1
@@ -32,15 +32,43 @@ try {
 
         # publish nuget
         if ($vscodeTarget -eq "stable") {
+            $packagestoPublish = @(
+                "Microsoft.dotnet-interactive",
+                "Microsoft.DotNet.Interactive",
+                "Microsoft.DotNet.Interactive.AspNetCore",
+                "Microsoft.DotNet.Interactive.Browser",
+                "Microsoft.DotNet.Interactive.CSharp",
+                "Microsoft.DotNet.Interactive.Documents",
+                "Microsoft.DotNet.Interactive.ExtensionLab",
+                "Microsoft.DotNet.Interactive.Formatting",
+                "Microsoft.DotNet.Interactive.FSharp",
+                "Microsoft.DotNet.Interactive.Http,",
+                "Microsoft.DotNet.Interactive.HttpRequest",
+                "Microsoft.DotNet.Interactive.Journey",
+                "Microsoft.DotNet.Interactive.Kql",
+                "Microsoft.DotNet.Interactive.Mermaid",
+                "Microsoft.DotNet.Interactive.PackageManagement",
+                "Microsoft.DotNet.Interactive.PowerShell",
+                "Microsoft.DotNet.Interactive.SQLite",
+                "Microsoft.DotNet.Interactive.SqlServer"
+            )
+
             Get-ChildItem "$artifactsPath\packages\Shipping\Microsoft.DotNet*.nupkg" | ForEach-Object {
                 $nugetPackagePath = $_.ToString()
-                # don't publish asp or netstandard packages
-                if (-Not ($nugetPackagePath -match "(CSharpProject|VisualStudio)")) {
-                    Write-Host "Publishing $nugetPackagePath"
-                    if (-Not $simulate) {
-                        dotnet nuget push $nugetPackagePath --source https://api.nuget.org/v3/index.json --api-key $nugetToken --no-symbols
-                        if ($LASTEXITCODE -ne 0) {
-                            exit $LASTEXITCODE
+                $nugetPacakgeName = $_.Name
+                if ($nugetPacakgeName -match '(?<=(?<id>.+))\.(?<version>((\d+\.\d+(\.\d+)?))(?<suffix>(-.*)?))\.nupkg')
+                {
+                    $packageId = $Matches.id
+                    $packageVersion = $Matches.version
+
+                    # publish only listed packages
+                    if ($packagestoPublish.Contains($packageId)) {
+                        Write-Host "Publishing $nugetPackagePath"
+                        if (-Not $simulate) {
+                            dotnet nuget push $nugetPackagePath --source https://api.nuget.org/v3/index.json --api-key $nugetToken --no-symbols
+                            if ($LASTEXITCODE -ne 0) {
+                                exit $LASTEXITCODE
+                            }
                         }
                     }
                 }

diff --git a/global.json b/global.json
@@ -1,14 +1,14 @@
 {
   "sdk": {
-    "version": "7.0.109",
+    "version": "7.0.110",
     "allowPrerelease": true,
     "rollForward": "latestMinor"
   },
   "tools": {
-    "dotnet": "7.0.109",
+    "dotnet": "7.0.110",
     "rollForward": "latestMinor"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23370.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3"
   }
 }
diff --git a/repack.ps1 b/repack.ps1
@@ -8,8 +8,17 @@ dotnet build
 dotnet pack  /p:PackageVersion=2.0.0
 
 # copy the dotnet-interactive packages to the temp directory
-Get-ChildItem -Recurse -Filter *.nupkg | Move-Item -Destination c:\temp\packages -Force
+$destinationPath = "C:\temp\packages"
+if (-not (Test-Path -Path $destinationPath -PathType Container)) {
+    New-Item -Path $destinationPath -ItemType Directory -Force
+}
+Get-ChildItem -Recurse -Filter *.nupkg | Move-Item -Destination $destinationPath -Force
 
 # delete the #r nuget caches
-Remove-Item -Recurse -Force ~\.packagemanagement\nuget\Cache
-Remove-Item -Recurse -Force ~\.packagemanagement\nuget\Projects
+if (Test-Path -Path ~\.packagemanagement\nuget\Cache -PathType Container) {
+    Remove-Item -Recurse -Force ~\.packagemanagement\nuget\Cache
+}
+
+if (Test-Path -Path ~\.packagemanagement\nuget\Projects -PathType Container) {
+    Remove-Item -Recurse -Force ~\.packagemanagement\nuget\Projects
+}
diff --git a/....ApiCompatibility.Tests/ApiCompatibilityTests.httpRequest_api_is_not_changed.approved.txt b/....ApiCompatibility.Tests/ApiCompatibilityTests.httpRequest_api_is_not_changed.approved.txt
@@ -14,7 +14,7 @@ Microsoft.DotNet.Interactive.HttpRequest
     public System.String Method { get;}
     public System.String Uri { get;}
     public System.String Version { get;}
-  public class HttpRequestKernel : Microsoft.DotNet.Interactive.Kernel, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestDiagnostics>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestKernelInfo>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestValue>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.SendValue>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.SubmitCode>, System.IDisposable
+  public class HttpRequestKernel : Microsoft.DotNet.Interactive.Kernel, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestDiagnostics>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestKernelInfo>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestValue>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestValueInfos>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.SendValue>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.SubmitCode>, System.IDisposable
     .ctor(System.String name = null, System.Net.Http.HttpClient client = null, System.Int32 responseDelayThresholdInMilliseconds = 1000, System.Int32 contentByteLengthThreshold = 500000)
   public class HttpRequestKernelExtension
     public static System.Void Load(Microsoft.DotNet.Interactive.Kernel kernel, System.Net.Http.HttpClient httpClient = null, System.Int32 responseDelayThresholdInMilliseconds = 1000, System.Int32 contentByteLengthThreshold = 500000)

diff --git a/...rosoft.DotNet.Interactive.CSharpProject/Microsoft.DotNet.Interactive.CSharpProject.csproj b/...rosoft.DotNet.Interactive.CSharpProject/Microsoft.DotNet.Interactive.CSharpProject.csproj
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Markdig.Signed" Version="0.30.4" />
+    <PackageReference Include="Markdig.Signed" Version=0.32.0" />
     <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCommonVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCommonVersion)" />