diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d5bb9ab5e12..7bbc2089e1d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -521,34 +521,34 @@ - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 diff --git a/eng/Versions.props b/eng/Versions.props index ec2a11bd20df..b3c01495522f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -302,10 +302,10 @@ - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 5e4f910fc839..00473c9f918d 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -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 diff --git a/global.json b/global.json index 8a0ac06c1072..e22fd19289ff 100644 --- a/global.json +++ b/global.json @@ -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" } diff --git a/test/dotnet-new.Tests/CommonTemplatesTests.cs b/test/dotnet-new.Tests/CommonTemplatesTests.cs index 974cbc63529a..6f598250a7ef 100644 --- a/test/dotnet-new.Tests/CommonTemplatesTests.cs +++ b/test/dotnet-new.Tests/CommonTemplatesTests.cs @@ -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 environmentUnderTest = new() { ["DOTNET_NOLOGO"] = false.ToString() }; TestContext.Current.AddTestEnvironmentVariables(environmentUnderTest); @@ -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") // { @@ -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}"; @@ -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, diff --git a/test/dotnet-new.Tests/DotnetClassTemplateTests.cs b/test/dotnet-new.Tests/DotnetClassTemplateTests.cs index 2b3df31746e6..3e2385687284 100644 --- a/test/dotnet-new.Tests/DotnetClassTemplateTests.cs +++ b/test/dotnet-new.Tests/DotnetClassTemplateTests.cs @@ -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 = "") @@ -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 = "", diff --git a/test/dotnet-new.Tests/TemplateEngineSamplesTest.cs b/test/dotnet-new.Tests/TemplateEngineSamplesTest.cs index b131bc33965b..4b9b0710a2b5 100644 --- a/test/dotnet-new.Tests/TemplateEngineSamplesTest.cs +++ b/test/dotnet-new.Tests/TemplateEngineSamplesTest.cs @@ -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,