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

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #45392

Merged
merged 74 commits into from
Dec 13, 2024
Merged

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #45392

Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
7377ba4
Merged PR 43126: [internal/release/8.0.1xx] Update dependencies from …
Sep 24, 2024
9b27227
Merge commit 'c1f738a4ae61eac0fbbd3826753fb7a3eb8030af'
Oct 2, 2024
d3aaf79
Merged PR 43912: [internal/release/8.0.1xx] Merge from public
vseanreesermsft Oct 17, 2024
62c3bd5
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 17, 2024
d8efb48
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 18, 2024
9c0f04a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 18, 2024
bd5c6c6
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 18, 2024
cf2c44b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 21, 2024
4f203da
Merged PR 43933: [internal/release/8.0.1xx] Update dependencies from …
Oct 21, 2024
74b2f41
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 22, 2024
36cf688
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 22, 2024
f3835a7
Merged PR 44079: [internal/release/8.0.1xx] Update dependencies from …
Oct 22, 2024
b3f71fa
Merge commit 'f3835a7fb45497f53fc92ca7dd4a06793884b1cd' into internal…
vseanreesermsft Nov 12, 2024
88e514c
Fix the template tests
marcpopMSFT Nov 12, 2024
c6fce02
Merging internal commits for release/8.0.1xx (#44824)
marcpopMSFT Nov 13, 2024
3911022
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 14, 2024
ccaa6b0
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 15, 2024
dbac151
Update dependencies from https://github.com/dotnet/razor build 202411…
dotnet-maestro[bot] Nov 16, 2024
2bc3ee8
[release/8.0.1xx] Update dependencies from dotnet/razor (#44900)
v-codyguan Nov 18, 2024
c9bfb52
[release/8.0.1xx] Update dependencies from dotnet/templating (#44883)
v-codyguan Nov 19, 2024
055e879
[release/8.0.1xx] Update dependencies from dotnet/arcade (#44872)
marcpopMSFT Nov 19, 2024
90b59c7
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Nov 22, 2024
6915717
Update dependencies from https://github.com/dotnet/razor build 202411…
dotnet-maestro[bot] Nov 24, 2024
b522889
Update dependencies from https://github.com/dotnet/roslyn build 20241…
dotnet-maestro[bot] Nov 24, 2024
0d47aa1
Work around COM concurrency issue when accessing VS instances
joeloff Nov 24, 2024
f93bb0c
[release/8.0.1xx] Update dependencies from dotnet/razor (#45074)
joeloff Nov 24, 2024
4a50aac
[release/8.0.1xx] Update dependencies from dotnet/roslyn (#45080)
joeloff Nov 24, 2024
eff3a2c
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
v-wuzhai Nov 25, 2024
edaef8b
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#45094)
v-wuzhai Nov 25, 2024
29a7efd
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 25, 2024
df7cda4
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-97e88e94-edb…
nagilson Nov 25, 2024
768bf8b
[release/8.0.3xx] Update dependencies from dotnet/templating (#45105)
nagilson Nov 25, 2024
9d79f19
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
v-wuzhai Nov 26, 2024
17b5b98
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#45119)
v-wuzhai Nov 26, 2024
0ce25ca
Update dependencies from https://github.com/dotnet/razor build 202411…
dotnet-maestro[bot] Nov 27, 2024
784a2a1
[release/8.0.4xx] Update dependencies from dotnet/razor (#45190)
v-wuzhai Nov 28, 2024
e9f0e82
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-97e88e94-edb…
surayya-MS Nov 29, 2024
b10febb
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-97e88e94-edb…
nagilson Dec 2, 2024
76d396c
Support publishing of multi-architecture OCI container images (#43085)
surayya-MS Dec 2, 2024
ed9f939
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
v-wuzhai Dec 3, 2024
cdab1cd
Merge branch 'release/9.0.1xx' into merge/release/8.0.4xx-to-release/…
surayya-MS Dec 3, 2024
b529e6f
fix conflict
surayya-MS Dec 3, 2024
a581ad8
use net 9 base images instead of net 9 preview
surayya-MS Dec 3, 2024
8551929
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Dec 3, 2024
02f27e0
Update dependencies from https://github.com/dotnet/sourcelink build 2…
dotnet-maestro[bot] Dec 3, 2024
b811627
[release/9.0.1xx] Update dependencies from dotnet/sourcelink (#45272)
nagilson Dec 3, 2024
fa5e4ef
[dotnet-format] Include the .NET Framework buildhost executable in th…
JoeRobich Dec 3, 2024
5abaaeb
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] Dec 3, 2024
a973533
[release/9.0.1xx] Update dependencies from dotnet/test-templates (#45…
v-wuzhai Dec 4, 2024
9817793
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] Dec 4, 2024
ac27433
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] Dec 4, 2024
6bc6a41
Merge branch 'release/9.0.1xx' into merge/release/8.0.4xx-to-release/…
surayya-MS Dec 4, 2024
d291012
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Dec 4, 2024
f2d23ca
Update dependencies from https://github.com/dotnet/sourcelink build 2…
dotnet-maestro[bot] Dec 4, 2024
16fb359
check docker availability before arch support in tests
surayya-MS Dec 4, 2024
063b86a
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#45252)
surayya-MS Dec 4, 2024
ce61561
[release/9.0.1xx] Update dependencies from dotnet/test-templates (#45…
nagilson Dec 5, 2024
976c7dd
[release/8.0.4xx] Update dependencies from dotnet/msbuild (#45306)
nagilson Dec 5, 2024
53e7626
[release/9.0.1xx] Update dependencies from dotnet/sourcelink (#45307)
nagilson Dec 5, 2024
4082960
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
v-wuzhai Dec 5, 2024
9d44815
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#45315)
v-wuzhai Dec 5, 2024
023fb0a
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Dec 5, 2024
bd3ac84
[release/9.0.1xx] Update dependencies from dotnet/source-build-refere…
dotnet-maestro[bot] Dec 5, 2024
35e7fde
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] Dec 5, 2024
f34203e
[backport][dotnet-format] Include the .NET Framework buildhost execut…
JoeRobich Dec 5, 2024
1983dc2
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Dec 5, 2024
d18ddf7
.NET Source-Build 9.0.101 December 2024 Updates (#45289)
dotnet-sb-bot Dec 5, 2024
b15de77
[release/9.0.1xx] Update dependencies from dotnet/roslyn-analyzers (#…
v-wuzhai Dec 6, 2024
92d3e8b
[release/9.0.1xx] Update dependencies from dotnet/test-templates (#45…
v-wuzhai Dec 6, 2024
2565b6b
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Dec 6, 2024
e1424c5
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Dec 10, 2024
a345a00
[release/9.0.1xx] Update dependencies from dotnet/msbuild (#45043)
nagilson Dec 10, 2024
eb17e6d
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
v-wuzhai Dec 11, 2024
ed95480
Merge branch 'release/9.0.2xx' into merge/release/9.0.1xx-to-release/…
surayya-MS Dec 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
Prev Previous commit
Next Next commit
[dotnet-format] Include the .NET Framework buildhost executable in th… 
…e SDK.

This is necessary for dotnet-format to loading .NET Framework projects.
  • Loading branch information
@JoeRobich
JoeRobich authored Dec 3, 2024
commit fa5e4ef5df514f8b07c3fb3a8d1b4a6219ec0d7a
3 changes: 2 additions & 1 deletion src/Layout/redist/targets/GenerateLayout.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@
</PropertyGroup>

<ItemGroup>
<DotnetFormatDllFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)//$(NetCurrent)/**/*.dll" />
<DotnetFormatDllFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)/$(NetCurrent)/**/*.dll" />
<DotnetFormatDllFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)/$(NetCurrent)/**/*.exe" />
<DotnetFormatConfigFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)/$(NetCurrent)/**/*.json" />
<DotnetFormatConfigFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)/$(NetCurrent)/**/*.config" />
</ItemGroup>
Expand Down
Loading