Skip to content

[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #28398

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

Merged
merged 16 commits into from
Oct 11, 2022
Merged

[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #28398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
976a11f
Fix checking for updated workload packs in advertising manifests
dsplaisted Oct 4, 2022
7b25ad2
Change default for msbuild server.
AR-May Oct 6, 2022
6b0b732
Update dependencies from https://github.com/dotnet/fsharp build 20221…
dotnet-maestro[bot] Oct 7, 2022
c6d7913
Update dependencies from https://github.com/dotnet/msbuild build 2022…
dotnet-maestro[bot] Oct 7, 2022
2f5c467
Update dependencies from https://github.com/dotnet/msbuild build 2022…
dotnet-maestro[bot] Oct 7, 2022
2a5480e
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Oct 7, 2022
3319522
Merge pull request #28391 from dotnet/darc-release/7.0.1xx-dcf1f863-8…
nagilson Oct 7, 2022
97c186b
Update dependencies from https://github.com/dotnet/msbuild build 2022…
dotnet-maestro[bot] Oct 7, 2022
043c0a2
Update dependencies from https://github.com/dotnet/msbuild build 2022…
dotnet-maestro[bot] Oct 7, 2022
f094391
Merge pull request #28327 from dsplaisted/fix-advertising-manifests-G…
nagilson Oct 7, 2022
0a78b80
Update dependencies from https://github.com/dotnet/fsharp build 20221…
dotnet-maestro[bot] Oct 7, 2022
24a486e
Merge pull request #28394 from dotnet/darc-release/7.0.1xx-926814e3-2…
marcpopMSFT Oct 7, 2022
dc03bcd
Merge pull request #28393 from dotnet/darc-release/7.0.1xx-e511a4bd-d…
marcpopMSFT Oct 7, 2022
dc92a6e
Merge pull request #28369 from AR-May/make-msbuild-server-opt-in-7.0.1xx
marcpopMSFT Oct 7, 2022
f22b2f8
Merge pull request #28387 from dotnet/darc-release/7.0.1xx-49312447-e…
nagilson Oct 7, 2022
09b638c
Merge branch 'release/7.0.1xx' into release/7.0.2xx
v-wuzhai Oct 8, 2022
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
8 changes: 4 additions & 4 deletions src/Assets/TestProjects/SampleManifest/MockListSampleUpdated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "mock-workload-1",
"kind": "dev",
"packs": [
"Test.Pack.A",
"Test.Pack.A.Renamed",
"Test.Pack.B",
"Test.Pack.C"
]
Expand All @@ -20,17 +20,17 @@
"mock-workload-3": {
"description": "mock-workload-3",
"packs": [
"Test.Pack.A"
"Test.Pack.A.Renamed"
]
}
},
"packs": {
"Test.Pack.A": {
"Test.Pack.A.Renamed": {
"version": "2.0.0",
"kind": "sdk"
},
"Test.Pack.B": {
"version": "2.0.0",
"version": "3.0.0",
"kind": "framework"
},
"Test.Pack.C": {
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Microsoft.DotNet.Cli.Utils
internal class MSBuildForwardingAppWithoutLogging
{
private static readonly bool AlwaysExecuteMSBuildOutOfProc = Env.GetEnvironmentVariableAsBool("DOTNET_CLI_RUN_MSBUILD_OUTOFPROC");
private static readonly bool UseMSBuildServer = !Env.GetEnvironmentVariableAsBool("DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER");
private static readonly bool UseMSBuildServer = Env.GetEnvironmentVariableAsBool("DOTNET_CLI_USE_MSBUILD_SERVER", false);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@baronfel FYI, is this change supposed to flow forward to 7.0.2xx?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes - we wantMSBuild server to be opt-in for the whole 7 family of releases. We'll probably end up targeting 8 to make it out-out again, but that's all pending further discussion and investigation of the impacts.


private const string MSBuildExeName = "MSBuild.dll";

Expand Down
5 changes: 3 additions & 2 deletions src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,9 @@ public IEnumerable<WorkloadId> GetUpdatedWorkloads(WorkloadResolver advertisingM

var existingWorkload = _workloads[workloadId];
var existingPacks = GetPacksInWorkload(existingWorkload.workload, existingWorkload.manifest).Select(p => p.packId).ToHashSet();
var updatedWorkload = advertisingManifestResolver._workloads[workloadId].workload;
var updatedPacks = advertisingManifestResolver.GetPacksInWorkload(existingWorkload.workload, existingWorkload.manifest).Select(p => p.packId);

var updatedWorkload = advertisingManifestResolver._workloads[workloadId];
var updatedPacks = advertisingManifestResolver.GetPacksInWorkload(updatedWorkload.workload, updatedWorkload.manifest).Select(p => p.packId);

if (!existingPacks.SetEquals(updatedPacks) || existingPacks.Any(p => PackHasChanged(_packs[p].pack, advertisingManifestResolver._packs[p].pack)))
{
Expand Down