Skip to content

Commit eeb882f

Browse files
MiYanniMiYanni
authored
Merge pull request #8698 from dotnet/darc-main-bebb6d9a-f111-4f8f-979a-09f35ead07ba
2 parents 7137d45 + e5895ea commit eeb882f

File tree

10 files changed

+40
-40
lines changed

10 files changed

+40
-40
lines changed

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
</Dependency>
2020
</ProductDependencies>
2121
<ToolsetDependencies>
22-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25074.4">
22+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25080.7">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>e89f8b1239360cafca490aa3bfee89e84df72186</Sha>
24+
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
2525
</Dependency>
2626
<!-- Intermediate is necessary for source build. -->
27-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25074.4">
27+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25080.7">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
29-
<Sha>e89f8b1239360cafca490aa3bfee89e84df72186</Sha>
29+
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
3030
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3131
</Dependency>
3232
<!-- Dependencies required for source build. We'll still update manually -->

‎eng/common/native/install-dependencies.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ case "$os" in
2424
apt update
2525

2626
apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
27-
libssl-dev libkrb5-dev zlib1g-dev pigz cpio
27+
libssl-dev libkrb5-dev pigz cpio
2828

2929
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
3030
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
31-
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio
31+
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
3232
elif [ "$ID" = "alpine" ]; then
33-
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio
33+
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
3434
else
3535
echo "Unsupported distro. distro: $ID"
3636
exit 1

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-alpha.1.25064.3"
3+
"dotnet": "10.0.100-alpha.1.25077.2"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25074.4"
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25080.7"
77
}
88
}

‎src/Microsoft.TemplateEngine.Edge/Installers/NuGet/NuGetManagedTemplatePackage.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,19 @@ public DateTime LastChangeTime
113113
public string? Reserved
114114
{
115115
get => Details.TryGetValue(ReservedKey, out string reserved) ? reserved : false.ToString();
116-
set => UpdateOrRemoveValue(Details, ReservedKey, value, (string entry) => !string.IsNullOrEmpty(entry));
116+
set => UpdateOrRemoveValue(Details, ReservedKey, value, (entry) => !string.IsNullOrEmpty(entry));
117117
}
118118

119119
public string? Author
120120
{
121121
get => Details.TryGetValue(AuthorKey, out string author) ? author : null;
122-
set => UpdateOrRemoveValue(Details, AuthorKey, value, (string entry) => !string.IsNullOrEmpty(entry));
122+
set => UpdateOrRemoveValue(Details, AuthorKey, value, (entry) => !string.IsNullOrEmpty(entry));
123123
}
124124

125125
public string? Owners
126126
{
127127
get => Details.TryGetValue(OwnersKey, out string owners) ? owners : null;
128-
set => UpdateOrRemoveValue(Details, OwnersKey, value, (string entry) => !string.IsNullOrEmpty(entry));
128+
set => UpdateOrRemoveValue(Details, OwnersKey, value, (entry) => !string.IsNullOrEmpty(entry));
129129
}
130130

131131
public bool IsLocalPackage
@@ -138,19 +138,19 @@ public bool IsLocalPackage
138138
}
139139
return false;
140140
}
141-
set => UpdateOrRemoveValue(Details, LocalPackageKey, value.ToString(), (string value) => value == true.ToString());
141+
set => UpdateOrRemoveValue(Details, LocalPackageKey, value.ToString(), (value) => value == true.ToString());
142142
}
143143

144144
public string? NuGetSource
145145
{
146146
get => Details.TryGetValue(NuGetSourceKey, out string nugetSource) ? nugetSource : null;
147-
set => UpdateOrRemoveValue(Details, NuGetSourceKey, value, (string entry) => !string.IsNullOrEmpty(entry));
147+
set => UpdateOrRemoveValue(Details, NuGetSourceKey, value, (entry) => !string.IsNullOrEmpty(entry));
148148
}
149149

150150
public string? Version
151151
{
152152
get => Details.TryGetValue(PackageVersionKey, out string version) ? version : null;
153-
set => UpdateOrRemoveValue(Details, PackageVersionKey, value, (string entry) => !string.IsNullOrEmpty(entry));
153+
set => UpdateOrRemoveValue(Details, PackageVersionKey, value, (entry) => !string.IsNullOrEmpty(entry));
154154
}
155155

156156
internal Dictionary<string, string> Details { get; }
@@ -169,10 +169,10 @@ public IReadOnlyDictionary<string, string> GetDetails()
169169
{
170170
var details = new Dictionary<string, string>();
171171

172-
details.TryAdd(AuthorKey, Author ?? string.Empty, (string entry) => !string.IsNullOrEmpty(entry));
173-
details.TryAdd(OwnersKey, Owners ?? string.Empty, (string entry) => !string.IsNullOrEmpty(entry));
174-
details.TryAdd(ReservedKey, Reserved ?? string.Empty, (string entry) => !string.IsNullOrEmpty(entry));
175-
details.TryAdd(NuGetSourceKey, NuGetSource ?? string.Empty, (string entry) => !string.IsNullOrEmpty(entry));
172+
details.TryAdd(AuthorKey, Author ?? string.Empty, (entry) => !string.IsNullOrEmpty(entry));
173+
details.TryAdd(OwnersKey, Owners ?? string.Empty, (entry) => !string.IsNullOrEmpty(entry));
174+
details.TryAdd(ReservedKey, Reserved ?? string.Empty, (entry) => !string.IsNullOrEmpty(entry));
175+
details.TryAdd(NuGetSourceKey, NuGetSource ?? string.Empty, (entry) => !string.IsNullOrEmpty(entry));
176176

177177
return details;
178178
}

‎src/Microsoft.TemplateEngine.Edge/Settings/TemplatePackageManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ private async Task<TemplateCache> UpdateTemplateCacheAsync(bool needsRebuild, Ca
342342
}
343343

344344
var scanResults = new ScanResult?[allTemplatePackages.Count];
345-
Parallel.For(0, allTemplatePackages.Count, async (int index) =>
345+
Parallel.For(0, allTemplatePackages.Count, async (index) =>
346346
{
347347
try
348348
{

‎src/Microsoft.TemplateEngine.Edge/ValidationUtils.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ private static void LogValidationEntries(ILogger logger, string header, IReadOnl
112112
{
113113
Action<string> log = severity switch
114114
{
115-
IValidationEntry.SeverityLevel.None => (string s) => throw new NotSupportedException($"{IValidationEntry.SeverityLevel.None} severity is not supported."),
116-
IValidationEntry.SeverityLevel.Info => (string s) => logger.LogDebug(s),
117-
IValidationEntry.SeverityLevel.Warning => (string s) => logger.LogWarning(s),
118-
IValidationEntry.SeverityLevel.Error => (string s) => logger.LogError(s),
115+
IValidationEntry.SeverityLevel.None => (s) => throw new NotSupportedException($"{IValidationEntry.SeverityLevel.None} severity is not supported."),
116+
IValidationEntry.SeverityLevel.Info => (s) => logger.LogDebug(s),
117+
IValidationEntry.SeverityLevel.Warning => (s) => logger.LogWarning(s),
118+
IValidationEntry.SeverityLevel.Error => (s) => logger.LogError(s),
119119
_ => throw new InvalidOperationException($"{severity} is not expected value for {nameof(IValidationEntry.SeverityLevel)}."),
120120
};
121121

‎test/Microsoft.TemplateEngine.Core.UnitTests/ChunkStreamReadTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public void VerifyConsumeWholeLine()
124124
{
125125
MockOperation o = new MockOperation(
126126
null,
127-
(IProcessorState state, int length, ref int position, int token) =>
127+
(state, length, ref position, token) =>
128128
{
129129
state.ConsumeWholeLine(ref length, ref position);
130130
return 0;

‎test/Microsoft.TemplateEngine.Core.UnitTests/CommonOperationsTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void VerifyTrimWhitespaceForward()
2525
{
2626
MockOperation o = new MockOperation(
2727
null,
28-
(IProcessorState state, int length, ref int position, int token) =>
28+
(state, length, ref position, token) =>
2929
{
3030
state.TrimWhitespace(true, false, ref length, ref position);
3131
return 0;
@@ -50,7 +50,7 @@ public void VerifyTrimWhitespaceBackward()
5050
{
5151
MockOperation o = new MockOperation(
5252
null,
53-
(IProcessorState state, int length, ref int position, int token) =>
53+
(state, length, ref position, token) =>
5454
{
5555
state.TrimWhitespace(false, true, ref length, ref position);
5656
return 0;
@@ -75,7 +75,7 @@ public void VerifyTrimWhitespaceBothDirections()
7575
{
7676
MockOperation o = new MockOperation(
7777
null,
78-
(IProcessorState state, int length, ref int position, int token) =>
78+
(state, length, ref position, token) =>
7979
{
8080
state.TrimWhitespace(true, true, ref length, ref position);
8181
return 0;
@@ -100,7 +100,7 @@ public void VerifyTrimWhitespaceNeitherDirection()
100100
{
101101
MockOperation o = new MockOperation(
102102
null,
103-
(IProcessorState state, int length, ref int position, int token) =>
103+
(state, length, ref position, token) =>
104104
{
105105
state.TrimWhitespace(false, false, ref length, ref position);
106106
return 0;
@@ -125,7 +125,7 @@ public void VerifyConsumeWholeLine()
125125
{
126126
MockOperation o = new MockOperation(
127127
null,
128-
(IProcessorState state, int length, ref int position, int token) =>
128+
(state, length, ref position, token) =>
129129
{
130130
state.ConsumeWholeLine(ref length, ref position);
131131
return 0;
@@ -158,7 +158,7 @@ public void VerifyWhitespaceHandlerConsumeWholeLine(bool trim, bool trimForward,
158158
{
159159
MockOperation o = new MockOperation(
160160
null,
161-
(IProcessorState state, int length, ref int position, int token) =>
161+
(state, length, ref position, token) =>
162162
{
163163
state.WhitespaceHandler(ref length, ref position, true, trim, trimForward, trimBackward);
164164
return 0;
@@ -187,7 +187,7 @@ public void VerifyWhitespaceHandlerTrim(bool trimForward, bool trimBackward)
187187
{
188188
MockOperation o = new MockOperation(
189189
null,
190-
(IProcessorState state, int length, ref int position, int token) =>
190+
(state, length, ref position, token) =>
191191
{
192192
state.WhitespaceHandler(ref length, ref position, false, true, trimForward, trimBackward);
193193
return 0;
@@ -213,7 +213,7 @@ public void VerifyWhitespaceHandlerTrimForwardButNotBack()
213213
{
214214
MockOperation o = new MockOperation(
215215
null,
216-
(IProcessorState state, int length, ref int position, int token) =>
216+
(state, length, ref position, token) =>
217217
{
218218
state.WhitespaceHandler(ref length, ref position, false, false, true, false);
219219
return 0;
@@ -238,7 +238,7 @@ public void VerifyWhitespaceHandlerTrimBackButNotForward()
238238
{
239239
MockOperation o = new MockOperation(
240240
null,
241-
(IProcessorState state, int length, ref int position, int token) =>
241+
(state, length, ref position, token) =>
242242
{
243243
state.WhitespaceHandler(ref length, ref position, false, false, false, true);
244244
return 0;
@@ -263,7 +263,7 @@ public void VerifyWhitespaceHandlerTrimBackAndForward()
263263
{
264264
MockOperation o = new MockOperation(
265265
null,
266-
(IProcessorState state, int length, ref int position, int token) =>
266+
(state, length, ref position, token) =>
267267
{
268268
state.WhitespaceHandler(ref length, ref position, false, false, true, true);
269269
return 0;

‎test/Microsoft.TemplateEngine.Core.UnitTests/TrieTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void VerifyThatTrieMatchesAtTheBeginning()
2929
new MockOperationProvider(
3030
new MockOperation(
3131
null,
32-
(IProcessorState processor, int bufferLength, ref int currentBufferPosition, int token) =>
32+
(processor, bufferLength, ref currentBufferPosition, token) =>
3333
{
3434
testActivated = true;
3535
return 0;
@@ -58,7 +58,7 @@ public void VerifyThatTrieMatchesAtTheEnd()
5858
new MockOperationProvider(
5959
new MockOperation(
6060
null,
61-
(IProcessorState processor, int bufferLength, ref int currentBufferPosition, int token) =>
61+
(processor, bufferLength, ref currentBufferPosition, token) =>
6262
{
6363
testActivated = true;
6464
return 0;
@@ -83,7 +83,7 @@ public void VerifyThatTrieMatchesInTheInterior()
8383
new MockOperationProvider(
8484
new MockOperation(
8585
null,
86-
(IProcessorState processor, int bufferLength, ref int currentBufferPosition, int token) =>
86+
(processor, bufferLength, ref currentBufferPosition, token) =>
8787
{
8888
testActivated = true;
8989
return 0;
@@ -108,7 +108,7 @@ public void VerifyThatTrieMatchesAsTheWholeContents()
108108
new MockOperationProvider(
109109
new MockOperation(
110110
null,
111-
(IProcessorState processor, int bufferLength, ref int currentBufferPosition, int token) =>
111+
(processor, bufferLength, ref currentBufferPosition, token) =>
112112
{
113113
testActivated = true;
114114
return 0;

‎tools/Microsoft.TemplateSearch.TemplateDiscovery/TemplateDiscoveryCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public TemplateDiscoveryCommand() : base("template-discovery", "Generates the te
104104
Options.Add(_diffOverrideNonPackagesOption);
105105

106106
TreatUnmatchedTokensAsErrors = true;
107-
SetAction(async (ParseResult parseResult, CancellationToken cancellationToken) =>
107+
SetAction(async (parseResult, cancellationToken) =>
108108
{
109109
var config = new CommandArgs(parseResult.GetValue(_basePathOption) ?? throw new Exception("Output path is not set"))
110110
{

0 commit comments

Comments
 (0)