Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ dotnet_diagnostic.IDE0301.severity = suggestion
dotnet_diagnostic.IDE0305.severity = suggestion
#Collection initialization can be simplified
dotnet_diagnostic.IDE0306.severity = suggestion
#Remove unnecessary nullable warning suppression
dotnet_diagnostic.IDE0370.severity = suggestion

# License header
file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
Expand Down
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-455f135" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-455f1358/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-74dc6e4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-74dc6e4e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26070.104</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>2.0.3</SystemCommandLinePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26077.113</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>2.0.4</SystemCommandLinePackageVersion>
<!-- _git/dotnet-runtime dependencies -->
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.1</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.1</MicrosoftExtensionsLoggingPackageVersion>
Expand Down
10 changes: 5 additions & 5 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="455f1358f39b4d38fa3893c327a45027c4a81843" BarId="297972" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="74dc6e4ed64cc0255a6be520761a857dda273863" BarId="299030" />
<ProductDependencies>
<Dependency Name="System.CommandLine" Version="2.0.3">
<Dependency Name="System.CommandLine" Version="2.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>74dc6e4ed64cc0255a6be520761a857dda273863</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26070.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26077.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>74dc6e4ed64cc0255a6be520761a857dda273863</Sha>
</Dependency>
<!-- Dependencies required for source build. We'll still update manually -->
<Dependency Name="System.Formats.Asn1" Version="10.0.1">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="Version.Details.props" />

<PropertyGroup>
<VersionPrefix>10.0.103</VersionPrefix>
<VersionPrefix>10.0.104</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration></PreReleaseVersionIteration>
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
demands: ImageOverride -equals build.ubuntu.2004.amd64
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
image: 1es-mariner-2
image: Azure-Linux-3-Amd64
os: linux
${{ else }}:
pool:
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"dotnet": "10.0.102"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.104"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.113"
}
}
6 changes: 3 additions & 3 deletions test/Microsoft.TemplateEngine.TestHelper/TestUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,19 +100,19 @@ public static async Task<T> AttemptSearch<T, TEx>(int count, TimeSpan interval,
{
if (attempt + 1 == count)
{
throw ex;
throw;
}

if (ex is AggregateException agEx)
{
if (!agEx.InnerExceptions.Any(e => e is TEx))
{
throw ex;
throw;
}
}
else if (ex is not TEx)
{
throw ex;
throw;
}
}
await Task.Delay(interval);
Expand Down