Skip to content

Commit 1d88278

Browse files
Merging main into darc-main-dcf4bc1d-a67b-4000-b897-279c1a12b209
2 parents b12a69e + a63310c commit 1d88278

File tree

19 files changed

+832
-678
lines changed

19 files changed

+832
-678
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25230.8",
6+
"version": "1.1.0-beta.25256.6",
77
"commands": [
88
"darc"
99
]

documentation/package-table.md

Lines changed: 70 additions & 102 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 285 additions & 285 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 134 additions & 134 deletions
Large diffs are not rendered by default.

eng/common/core-templates/jobs/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
1515
defaultManagedPlatform:
1616
name: 'Managed'
17-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
1818

1919
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
2020
# object in this array is sent to the job template as 'platform'. If no platforms are specified,

eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ steps:
4646
buildConfig='$(_BuildConfig)'
4747
fi
4848
49-
officialBuildArgs=
50-
if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then
51-
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
52-
fi
53-
5449
targetRidArgs=
5550
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
5651
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
@@ -66,26 +61,15 @@ steps:
6661
baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
6762
fi
6863
69-
publishArgs=
70-
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
71-
publishArgs='--publish'
72-
fi
73-
74-
assetManifestFileName=SourceBuild_RidSpecific.xml
75-
if [ '${{ parameters.platform.name }}' != '' ]; then
76-
assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
77-
fi
78-
7964
portableBuildArgs=
8065
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
8166
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
8267
fi
8368
8469
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8570
--configuration $buildConfig \
86-
--restore --build --pack $publishArgs -bl \
71+
--restore --build --pack -bl \
8772
${{ parameters.platform.buildArguments }} \
88-
$officialBuildArgs \
8973
$internalRuntimeDownloadArgs \
9074
$internalRestoreArgs \
9175
$targetRidArgs \
@@ -94,7 +78,6 @@ steps:
9478
$portableBuildArgs \
9579
/p:DotNetBuildSourceOnly=true \
9680
/p:DotNetBuildRepo=true \
97-
/p:AssetManifestFileName=$assetManifestFileName
9881
displayName: Build
9982

10083
# Upload build logs for diagnosis.

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25230.108",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25230.108",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25252.107",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25252.107",
1919
"Microsoft.Build.NoTargets": "3.7.0",
2020
"Microsoft.Build.Traversal": "3.4.0"
2121
}

src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs

Lines changed: 132 additions & 100 deletions
Large diffs are not rendered by default.

src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke
100100
}
101101

102102
var projectMap = new ProjectNodeMap(evaluationResult.ProjectGraph, Context.Reporter);
103-
compilationHandler = new CompilationHandler(Context.Reporter, Context.EnvironmentOptions, shutdownCancellationToken);
103+
compilationHandler = new CompilationHandler(Context.Reporter, Context.EnvironmentOptions, Context.Options, shutdownCancellationToken);
104104
var scopedCssFileHandler = new ScopedCssFileHandler(Context.Reporter, projectMap, browserConnector);
105105
var projectLauncher = new ProjectLauncher(Context, projectMap, browserConnector, compilationHandler, iteration);
106106
var outputDirectories = GetProjectOutputDirectories(evaluationResult.ProjectGraph);

src/BuiltInTools/dotnet-watch/Internal/IReporter.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ public bool TryGetMessage(string? prefix, object?[] args, [NotNullWhen(true)] ou
7474
public static readonly MessageDescriptor IgnoringChangeInHiddenDirectory = new("Ignoring change in hidden directory '{0}': {1} '{2}'", "⌚", MessageSeverity.Verbose, s_id++);
7575
public static readonly MessageDescriptor IgnoringChangeInOutputDirectory = new("Ignoring change in output directory: {0} '{1}'", "⌚", MessageSeverity.Verbose, s_id++);
7676
public static readonly MessageDescriptor FileAdditionTriggeredReEvaluation = new("File addition triggered re-evaluation.", "⌚", MessageSeverity.Verbose, s_id++);
77-
public static readonly MessageDescriptor NoCSharpChangesToApply = new ("No C# changes to apply.", "⌚", MessageSeverity.Output, s_id++);
77+
public static readonly MessageDescriptor NoCSharpChangesToApply = new("No C# changes to apply.", "⌚", MessageSeverity.Output, s_id++);
78+
public static readonly MessageDescriptor Exited = new("Exited", "⌚", MessageSeverity.Output, s_id++);
79+
public static readonly MessageDescriptor ExitedWithUnknownErrorCode = new("Exited with unknown error code", "❌", MessageSeverity.Error, s_id++);
80+
public static readonly MessageDescriptor ExitedWithErrorCode = new("Exited with error code {0}", "❌", MessageSeverity.Error, s_id++);
7881
}
7982

8083
internal interface IReporter

0 commit comments

Comments
 (0)