Skip to content

[main] Update dependencies from dotnet/arcade #41539

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 2 commits into from
Jun 12, 2024
Merged

[main] Update dependencies from dotnet/arcade #41539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b02ce33
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 12, 2024
29b8d03
Update to async Task
ViktorHofer Jun 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
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,34 +521,34 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24311.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24311.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24311.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24311.1">
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24311.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24311.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24311.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-preview.6.24307.2">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24311.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24311.1</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24311.1</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24311.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24311.10</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24311.10</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24311.10</MicrosoftDotNetXUnitExtensionsVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,9 @@ function InitializeBuildTool {
function GetNuGetPackageCachePath {
if [[ -z ${NUGET_PACKAGES:-} ]]; then
if [[ "$use_global_nuget_cache" == true ]]; then
export NUGET_PACKAGES="$HOME/.nuget/packages"
export NUGET_PACKAGES="$HOME/.nuget/packages/"
else
export NUGET_PACKAGES="$repo_root/.packages"
export NUGET_PACKAGES="$repo_root/.packages/"
export RESTORENOHTTPCACHE=true
fi
fi
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24311.1",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.10",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24311.10",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
}
Expand Down
8 changes: 4 additions & 4 deletions test/dotnet-new.Tests/CommonTemplatesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public CommonTemplatesTests(SharedHomeDirectory fixture, ITestOutputHelper log)
[InlineData("EditorConfig file", ".editorconfig", new[] { "--empty" })]
[InlineData("MSBuild Directory.Build.props file", "buildprops", new[] { "--inherit", "--use-artifacts" })]
[InlineData("MSBuild Directory.Build.targets file", "buildtargets", new[] { "--inherit" })]
public async void AllCommonItemsCreate(string expectedTemplateName, string templateShortName, string[]? args)
public async Task AllCommonItemsCreate(string expectedTemplateName, string templateShortName, string[]? args)
{
Dictionary<string, string> environmentUnderTest = new() { ["DOTNET_NOLOGO"] = false.ToString() };
TestContext.Current.AddTestEnvironmentVariables(environmentUnderTest);
Expand Down Expand Up @@ -96,7 +96,7 @@ public async void AllCommonItemsCreate(string expectedTemplateName, string templ
//

//[Fact]
//public async void EditorConfigTests_Default()
//public async Task EditorConfigTests_Default()
//{
// TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: "editorconfig")
// {
Expand Down Expand Up @@ -162,7 +162,7 @@ public void NuGetConfigPermissions()
[Theory]
[InlineData(new object[] { "console", "C#" })]
[InlineData(new object[] { "console", "VB" })]
public async void AotVariants(string name, string language)
public async Task AotVariants(string name, string language)
{
// template framework needs to be hardcoded here during the major version transition.
string currentDefaultFramework = $"net{Environment.Version.Major}.{Environment.Version.Minor}";
Expand Down Expand Up @@ -321,7 +321,7 @@ public async void AotVariants(string name, string language)
[Theory]
//creates all possible combinations for supported templates, language versions and frameworks
[MemberData(nameof(FeaturesSupport_Data))]
public async void FeaturesSupport(
public async Task FeaturesSupport(
string name,
bool buildPass,
string? framework,
Expand Down
4 changes: 2 additions & 2 deletions test/dotnet-new.Tests/DotnetClassTemplateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public DotnetClassTemplateTests(SharedHomeDirectory fixture, ITestOutputHelper l
[InlineData("enum", "", "net7.0")]
[InlineData("enum", "9.0", "netstandard2.0")]
[InlineData("enum", "", "netstandard2.0")]
public async void DotnetCSharpClassTemplatesTest(
public async Task DotnetCSharpClassTemplatesTest(
string templateShortName,
string langVersion = "",
string targetFramework = "")
Expand Down Expand Up @@ -120,7 +120,7 @@ public async void DotnetCSharpClassTemplatesTest(
[InlineData("module", "latest", "net6.0")]
[InlineData("module", "15.3", "netstandard2.0")]
[InlineData("module", "15.5", "netstandard2.0", "CustomFileName")]
public async void DotnetVisualBasicClassTemplatesTest(
public async Task DotnetVisualBasicClassTemplatesTest(
string templateShortName,
string langVersion = "",
string targetFramework = "",
Expand Down
2 changes: 1 addition & 1 deletion test/dotnet-new.Tests/TemplateEngineSamplesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public TemplateEngineSamplesTest(SharedHomeDirectory sharedHome, ITestOutputHelp
[InlineData("13-constant-value", "sample13", null, "replacing of constant value")]
[InlineData("15-computed-symbol", "sample15", null, "usage computed symbols")]
[InlineData("16-string-value-transform", "sample16", null, "usage of derived parameter")]
public async void TemplateEngineSamplesProjectTest(
public async Task TemplateEngineSamplesProjectTest(
string folderName,
string shortName,
string[]? arguments,
Expand Down