Fix Mac OS on AppVeyor

Dotnet-Boxed · Jan 14, 2021 · 8b8b365 · 8b8b365
1 parent 7bbb938
commit 8b8b365
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/Source/NuGetTemplate/appveyor.yml b/Source/NuGetTemplate/appveyor.yml
@@ -28,7 +28,7 @@ build_script:
       Invoke-WebRequest "https://dot.net/v1/dotnet-install.sh" -OutFile "./dotnet-install.sh"
       sudo chmod u+x dotnet-install.sh
       if ($isMacOS) {
-        sudo ./dotnet-install.sh --jsonfile global.json --install-dir '/Users/appveyor/.dotnet'
+        sudo ./dotnet-install.sh --jsonfile global.json --install-dir '/usr/local/share/dotnet'
       } else {
         sudo ./dotnet-install.sh --jsonfile global.json --install-dir '/usr/share/dotnet'
       }

diff --git a/Tests/Boxed.Templates.FunctionalTest/ApiTemplateTest.cs b/Tests/Boxed.Templates.FunctionalTest/ApiTemplateTest.cs
@@ -47,7 +47,7 @@ public ApiTemplateTest(ITestOutputHelper testOutputHelper)
         public async Task RestoreBuildTest_ApiDefaults_SuccessfulAsync(string name, params string[] arguments)
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(TemplateName, name, DefaultArguments.ToArguments(arguments))
@@ -65,7 +65,7 @@ public async Task RestoreBuildTest_ApiDefaults_SuccessfulAsync(string name, para
         public async Task Cake_ApiDefaults_SuccessfulAsync(string name, params string[] arguments)
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(TemplateName, name, DefaultArguments.ToArguments(arguments))
@@ -81,7 +81,7 @@ public async Task Cake_ApiDefaults_SuccessfulAsync(string name, params string[]
         public async Task RestoreBuildTestRun_ApiDefaults_SuccessfulAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(TemplateName, "ApiDefaults", DefaultArguments.ToArguments())
@@ -168,7 +168,7 @@ await project
         public async Task RestoreBuildTestRun_HealthCheckFalse_SuccessfulAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(
@@ -205,7 +205,7 @@ await project
         public async Task RestoreBuildTestRun_HttpsEverywhereFalse_SuccessfulAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(
@@ -243,7 +243,7 @@ await project
         public async Task RestoreBuildTestRun_SwaggerFalse_SuccessfulAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(
@@ -275,7 +275,7 @@ await project
         public async Task RestoreBuildTestRun_DockerFalse_SuccessfulAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(

diff --git a/Tests/Boxed.Templates.FunctionalTest/Boxed.Templates.FunctionalTest.csproj b/Tests/Boxed.Templates.FunctionalTest/Boxed.Templates.FunctionalTest.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="Boxed.DotnetNewTest" Version="3.7.1" />
+    <PackageReference Include="Boxed.DotnetNewTest" Version="4.0.0" />
     <PackageReference Include="coverlet.collector" PrivateAssets="all" Version="3.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Tests/Boxed.Templates.FunctionalTest/GraphQLTemplateTest.cs b/Tests/Boxed.Templates.FunctionalTest/GraphQLTemplateTest.cs
@@ -46,7 +46,7 @@ public GraphQLTemplateTest(ITestOutputHelper testOutputHelper)
         public async Task RestoreBuildTest_GraphQLDefaults_SuccessfulAsync(string name, params string[] arguments)
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(TemplateName, name, DefaultArguments.ToArguments(arguments))
@@ -64,7 +64,7 @@ public async Task RestoreBuildTest_GraphQLDefaults_SuccessfulAsync(string name,
         public async Task Cake_GraphQLDefaults_SuccessfulAsync(string name, params string[] arguments)
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(TemplateName, name, DefaultArguments.ToArguments(arguments))
@@ -80,7 +80,7 @@ public async Task Cake_GraphQLDefaults_SuccessfulAsync(string name, params strin
         public async Task RestoreBuildTestRun_GraphQLDefaults_SuccessfulAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(TemplateName, "GraphQLTDefaults", DefaultArguments.ToArguments())
@@ -139,7 +139,7 @@ await project
         public async Task RestoreBuildTestRun_HealthCheckFalse_SuccessfulAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(
@@ -176,7 +176,7 @@ await project
         public async Task RestoreBuildTestRun_QueryGraphQlIntrospection_ReturnsResultsAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(TemplateName, "GraphQLTDefaults", DefaultArguments.ToArguments())
@@ -209,7 +209,7 @@ await project
         public async Task RestoreBuildTestRun_HttpsEverywhereFalse_SuccessfulAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(
@@ -247,7 +247,7 @@ await project
         public async Task RestoreBuildTestRun_AuthorizationTrue_Returns400BadRequestAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(
@@ -288,7 +288,7 @@ await project
         public async Task RestoreBuildTestRun_AuthorizationFalse_DateOfBirthReturnedSuccessfullyAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(
@@ -321,7 +321,7 @@ await project
         public async Task RestoreBuildTestRun_DockerFalse_SuccessfulAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(

diff --git a/Tests/Boxed.Templates.FunctionalTest/NuGetTemplateTest.cs b/Tests/Boxed.Templates.FunctionalTest/NuGetTemplateTest.cs
@@ -34,7 +34,7 @@ public NuGetTemplateTest(ITestOutputHelper testOutputHelper)
         public async Task RestoreBuildTest_NuGetDefaults_SuccessfulAsync(string name, params string[] arguments)
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(TemplateName, name, arguments.ToArguments())
@@ -58,7 +58,7 @@ public async Task RestoreBuildTest_NuGetDefaults_SuccessfulAsync(string name, pa
         public async Task Cake_NuGetDefaults_SuccessfulAsync(string name, params string[] arguments)
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(TemplateName, name, arguments.ToArguments())
@@ -81,7 +81,7 @@ public async Task RestoreBuildTestCake_NoContinuousIntegration_SuccessfulAsync(
             params string[] arguments)
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(TemplateName, name, arguments.ToArguments())
@@ -104,7 +104,7 @@ public async Task RestoreBuildTestCake_NoContinuousIntegration_SuccessfulAsync(
         public async Task RestoreBuildTest_SignFalse_SuccessfulAsync()
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(

diff --git a/Tests/Boxed.Templates.FunctionalTest/OrleansTemplateTest.cs b/Tests/Boxed.Templates.FunctionalTest/OrleansTemplateTest.cs
@@ -35,7 +35,7 @@ public OrleansTemplateTest(ITestOutputHelper testOutputHelper)
         public async Task RestoreBuild_OrleansDefaults_SuccessfulAsync(string name, params string[] arguments)
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(TemplateName, name, DefaultArguments.ToArguments(arguments))
@@ -53,7 +53,7 @@ public async Task RestoreBuild_OrleansDefaults_SuccessfulAsync(string name, para
         public async Task Cake_ApiDefaults_SuccessfulAsync(string name, params string[] arguments)
         {
             await InstallTemplateAsync().ConfigureAwait(false);
-            using (var tempDirectory = TempDirectory.NewTempDirectory())
+            await using (var tempDirectory = TempDirectory.NewTempDirectory())
             {
                 var project = await tempDirectory
                     .DotnetNewAsync(TemplateName, name, DefaultArguments.ToArguments(arguments))

diff --git a/appveyor.yml b/appveyor.yml
@@ -28,7 +28,7 @@ build_script:
       Invoke-WebRequest "https://dot.net/v1/dotnet-install.sh" -OutFile "./dotnet-install.sh"
       sudo chmod u+x dotnet-install.sh
       if ($isMacOS) {
-        sudo ./dotnet-install.sh --jsonfile global.json --install-dir '/Users/appveyor/.dotnet'
+        sudo ./dotnet-install.sh --jsonfile global.json --install-dir '/usr/local/share/dotnet'
       } else {
         sudo ./dotnet-install.sh --jsonfile global.json --install-dir '/usr/share/dotnet'
       }