Skip to content

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' #49724

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

Open
wants to merge 69 commits into
base: release/9.0.1xx
Choose a base branch
from
Open

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' #49724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
e363736
Merge commit 'fe347808ee82b0935bb2ad72dad1cd0c6781048f'
Jun 4, 2025
77092d4
Merge commit 'c3e188121ed560c9dc62e25fe9e743dfcdf4dd50'
Jun 4, 2025
be79f1c
Merge commit '6bd6e4a1b3e14b531aa634abf6acddffc8324fa8'
Jun 4, 2025
78c0601
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 12, 2025
8c92a35
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 12, 2025
6f97a1f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 12, 2025
b711d51
Merged PR 50798: [internal/release/8.0.4xx] Update dependencies from …
Jun 12, 2025
47c99b4
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 13, 2025
df5f7f3
Merged PR 50874: [internal/release/8.0.4xx] Update dependencies from …
Jun 13, 2025
55cf04a
Merged PR 50859: Merge release/8.0.4xx to internal/release/8.0.4xx
v-wuzhai Jun 13, 2025
96f34db
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 17, 2025
abd77b9
Merged PR 51003: [internal/release/8.0.4xx] Update dependencies from …
Jun 17, 2025
0879a24
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 17, 2025
3d3ab5b
Merge remote-tracking branch 'ADO/internal/release/8.0.4xx' into dev/…
marcpopMSFT Jun 17, 2025
e6ce002
Merged PR 51010: Merge public to internal
marcpopMSFT Jun 17, 2025
88a05a0
Merged PR 51008: [internal/release/8.0.4xx] Update dependencies from …
Jun 17, 2025
647db78
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Jun 18, 2025
8192651
Merged PR 51089: Add back the STJ pinning as DependencyModel has a 8.…
marcpopMSFT Jun 20, 2025
8ee6aa8
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jun 27, 2025
4de8310
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jun 27, 2025
6e068e9
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Jun 27, 2025
0f6f55f
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Jun 28, 2025
43977e4
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Jul 3, 2025
294777a
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Jul 3, 2025
bbea0e1
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Jul 4, 2025
7226d2e
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Jul 5, 2025
7512127
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Jul 5, 2025
1b9caed
Update branding to 8.0.119
vseanreesermsft Jul 3, 2025
f8b4869
Update branding to 8.0.119 (#49650)
SimonZhao888 Jul 8, 2025
e9c1d3a
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/SDK into …
Jul 8, 2025
07ed1a2
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/SDK into …
Jul 8, 2025
3100f76
Update branding to 8.0.316
vseanreesermsft Jul 3, 2025
ea299e5
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Jul 4, 2025
0910f59
Update dependencies from https://github.com/dotnet/razor build 202506…
dotnet-maestro[bot] Jun 30, 2025
fc7dfc3
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jun 27, 2025
4207da4
[release/8.0.1xx] Update dependencies from dotnet/arcade (#49572)
SimonZhao888 Jul 8, 2025
dd151d8
[release/8.0.1xx] Update dependencies from dotnet/templating (#49579)
SimonZhao888 Jul 8, 2025
681f059
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
Jul 8, 2025
c075814
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#49681)
nagilson Jul 8, 2025
1ff58cc
Merge branch 'release/8.0.3xx' into branding-8.0.316-2025-07-03-1035-…
nagilson Jul 8, 2025
328520c
use new ACR for registry image
baronfel Jul 8, 2025
827f5ac
Update branding to 8.0.316 (#49651)
nagilson Jul 8, 2025
42f4431
[release/8.0.3xx] Use new ACR for registry image (#49689)
github-actions[bot] Jul 8, 2025
157312c
Merge commit '8192651ba0e565170fb8e007e0f51a60d86449ba' into internal…
vseanreesermsft Jul 8, 2025
86df84c
[release/8.0.3xx] Update dependencies from dotnet/msbuild (#49655)
SimonZhao888 Jul 9, 2025
fac5db3
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
Jul 9, 2025
e36c761
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
Jul 9, 2025
f99c96d
[release/8.0.3xx] Update dependencies from dotnet/razor (#49600)
SimonZhao888 Jul 9, 2025
993b23c
[release/8.0.3xx] Update dependencies from dotnet/arcade (#49573)
SimonZhao888 Jul 9, 2025
5f9d78d
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
Jul 9, 2025
4d794bd
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
Jul 9, 2025
5e86f1e
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
Jul 9, 2025
42bc132
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
Jul 9, 2025
09cd9a9
[release/8.0.4xx] Use new ACR for registry image (#49690)
nagilson Jul 9, 2025
481993a
Merging internal commits for release/8.0.4xx (#49700)
nagilson Jul 9, 2025
faa2a1b
Merge branch 'release/8.0.4xx' into darc-release/8.0.4xx-26b810a0-735…
nagilson Jul 9, 2025
aefed72
Merge branch 'release/8.0.4xx' into darc-release/8.0.4xx-3664fbe6-09a…
nagilson Jul 9, 2025
af65b1f
Merge branch 'release/8.0.4xx' into darc-release/8.0.4xx-8d095909-456…
nagilson Jul 9, 2025
8ce027f
[release/8.0.4xx] Update dependencies from dotnet/arcade (#49574)
nagilson Jul 10, 2025
5cbc59a
[release/8.0.4xx] Update dependencies from dotnet/msbuild (#49640)
nagilson Jul 10, 2025
b0f69b7
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
Jul 10, 2025
ae4133a
restore the commit for package sources from dotnet-templating
Jul 10, 2025
6062efe
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
Jul 10, 2025
e744199
[release/8.0.4xx] Update dependencies from dotnet/templating (#49466)
SimonZhao888 Jul 10, 2025
b6c57f2
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#49695)
SimonZhao888 Jul 10, 2025
e1dede5
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
Jul 10, 2025
4e28ea5
Merge branch 'release/9.0.1xx' into merge/release/8.0.4xx-to-release/…
GangWang01 Jul 14, 2025
c7b0a87
Merge branch 'release/9.0.1xx' into merge/release/8.0.4xx-to-release/…
nagilson Jul 15, 2025
b7a7611
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
Jul 16, 2025
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: 1 addition & 1 deletion src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" />
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" Condition="'$(TargetFramework)'=='net472'" />
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)'=='net472'" />
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)'=='net472'" VersionOverride="$(PinnedSystemTextJsonPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<PackageReference Include="Microsoft.Web.Deployment" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.Text.Json" VersionOverride="$(PinnedSystemTextJsonPackageVersion)" />
</ItemGroup>
<ItemGroup>
<Compile Include="**\*.cs" />
Expand Down
Loading