Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/dev17.10 to release/dev17.11 #10711

Merged
merged 7 commits into from
Aug 13, 2024
Merged

Merge release/dev17.10 to release/dev17.11 #10711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
085aa32
Upgrade testing analyzers to address CG alert.
333fred Aug 6, 2024
6353caa
Manually reference Microsoft.IO.Redist 6.0.1 where needed to fix CG a…
333fred Aug 6, 2024
47438b5
Merge remote-tracking branch 'upstream/release/dev17.8' into merges/r…
333fred Aug 6, 2024
a11f5d7
Merge release/dev17.8 to release/dev17.10 (#10710)
dotnet-bot Aug 6, 2024
f8c1f45
Update System.Formats.Asn1 to address CG alert.
333fred Aug 6, 2024
b5c4983
Upgrade System.Security.Cryptography.Xml to avoid CG alerts.
333fred Aug 6, 2024
82ddac1
Merge remote-tracking branch 'upstream/release/dev17.10' into merges/…
333fred Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
<PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="$(_MicrosoftVisualStudioShellPackagesVersion)" />
<PackageVersion Include="Microsoft.Internal.VisualStudio.Interop" Version="$(_MicrosoftVisualStudioShellPackagesVersion)" />
<PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
<PackageVersion Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.Copilot" Version="0.2.28-beta" />
<PackageVersion Include="Microsoft.VisualStudio.ComponentModelHost" Version="17.10.151" />
Expand Down Expand Up @@ -109,6 +110,7 @@
<PackageVersion Include="NuGet.SolutionRestoreManager.Interop" Version="4.8.0" />
<PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="$(_MicrosoftCodeAnalysisAnalyzersPackageVersion)" />
<PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
<PackageVersion Include="System.Formats.Asn1" Version="6.0.1" />
<PackageVersion Include="System.Resources.Extensions" Version="6.0.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
Expand Down
1 change: 1 addition & 0 deletions src/Compiler/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.Compiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<PackageReference Include="BenchmarkDotNet" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Security.Cryptography.Xml" />
<PackageReference Include="System.Formats.Asn1" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions ...zor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
<PackageReference Include="Microsoft.Build.Locator" />
<PackageReference Include="System.Security.Cryptography.Xml" />
<PackageReference Include="System.Formats.Asn1" />
</ItemGroup>

<!-- Reference the local source generator when building in regular configurations -->
Expand Down
3 changes: 3 additions & 0 deletions ...ExternalAccess.LegacyEditor/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" PrivateAssets="all" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Framework" PrivateAssets="all"/>
<!-- Manually upgrade to address CG alert. When the VS packages
pull in the right version, this can be removed. -->
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'" PrivateAssets="all"/>
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions ...icrosoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
<PackageReference Include="Microsoft.CommonLanguageServerProtocol.Framework" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<!-- Manually upgrade to address CG alert. When the VS packages
pull in the right version, this can be removed. -->
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'" />

<!--
Pinning packages to avoid misaligned reference CI failures.
Expand Down
3 changes: 3 additions & 0 deletions ...geServer.ContainedLanguage/Microsoft.VisualStudio.LanguageServer.ContainedLanguage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol.Extensions" />
<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol.Internal" />
<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Client.Implementation" />
<!-- Manually upgrade to address CG alert. When the VS packages
pull in the right version, this can be removed. -->
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 4 additions & 1 deletion ....VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@

<PackageReference Include="Microsoft.VisualStudio.LiveShare" />
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" />
<!-- Manually upgrade to address CG alert. When the VS packages
pull in the right version, this can be removed. -->
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'" />

<!--
Pinning packages to avoid misaligned reference CI failures.
Expand Down Expand Up @@ -171,4 +174,4 @@

<Import Project="..\..\..\Shared\Microsoft.AspNetCore.Razor.Serialization.Json\Microsoft.AspNetCore.Razor.Serialization.Json.projitems" Label="Shared" />

</Project>
</Project>
3 changes: 3 additions & 0 deletions ...dio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
<ItemGroup>
<!-- To include the ProvideCodeBase attribute type. -->
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" />
<!-- Manually upgrade to address CG alert. When the VS packages
pull in the right version, this can be removed. -->
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'" />
</ItemGroup>

<!-- Reference the LSP protocol dlls so that we can include them in the code base and output them with the VSIX. -->
Expand Down
3 changes: 3 additions & 0 deletions ...or/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@
<PackageReference Include="Microsoft.NET.Sdk.Razor" IncludeAssets="None" PrivateAssets="All" GeneratePathProperty="true" />
<PackageReference Include="System.Resources.Extensions" />
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" />
<!-- Manually upgrade to address CG alert. When the VS packages
pull in the right version, this can be removed. -->
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'" />

<!--
Pinning packages to avoid misaligned reference CI failures.
Expand Down
3 changes: 3 additions & 0 deletions ....VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
<PackageReference Include="Microsoft.VisualStudio.Extensibility.Testing.Xunit" />
<PackageReference Include="Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" />
<!-- Manually upgrade to address CG alert. When the VS packages
pull in the right version, this can be removed. -->
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'" />
<PackageReference Include="NuGet.SolutionRestoreManager.Interop" />
<PackageReference Include="Microsoft.Internal.VisualStudio.Shell.Framework" />
<PackageReference Include="xunit" />
Expand Down