Merge pull request #6770 from dotnet/main

Merge main into live
dotnet · Apr 10, 2024 · c0ab561 · c0ab561
2 parents f41b9e3 + ce10670
commit c0ab561
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 28 deletions.
diff --git a/azure/sdk-identity-resources-storage/AzureIdentityStorageExample.csproj b/azure/sdk-identity-resources-storage/AzureIdentityStorageExample.csproj
@@ -21,8 +21,8 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.10.4" />
-    <PackageReference Include="Azure.ResourceManager.Resources" Version="1.7.0" />
-    <PackageReference Include="Azure.ResourceManager.Storage" Version="1.2.0" />
+    <PackageReference Include="Azure.ResourceManager.Resources" Version="1.7.1" />
+    <PackageReference Include="Azure.ResourceManager.Storage" Version="1.2.1" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
   </ItemGroup>
 

diff --git a/core/getting-started/golden/app/app.csproj b/core/getting-started/golden/app/app.csproj
@@ -6,7 +6,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/core/getting-started/golden/library/library.csproj b/core/getting-started/golden/library/library.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard1.4</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json">

diff --git a/core/getting-started/golden/test-library/test-library.csproj b/core/getting-started/golden/test-library/test-library.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...tting-started/unit-testing-using-dotnet-test/PrimeService.Tests/PrimeService.Tests.csproj b/...tting-started/unit-testing-using-dotnet-test/PrimeService.Tests/PrimeService.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/core/getting-started/unit-testing-using-mstest/PrimeService.Tests/PrimeService.Tests.csproj b/core/getting-started/unit-testing-using-mstest/PrimeService.Tests/PrimeService.Tests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/core/getting-started/unit-testing-using-nunit/PrimeService.Tests/PrimeService.Tests.csproj b/core/getting-started/unit-testing-using-nunit/PrimeService.Tests/PrimeService.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/...getting-started/unit-testing-using-nunit/PrimeService.Tests/PrimeService_IsPrimeShould.cs b/...getting-started/unit-testing-using-nunit/PrimeService.Tests/PrimeService_IsPrimeShould.cs
@@ -20,7 +20,7 @@ public void IsPrime_InputIs1_ReturnFalse()
         {
             var result = _primeService.IsPrime(1);
 
-            Assert.IsFalse(result, "1 should not be prime");
+            Assert.That(result, Is.False, "1 should not be prime");
         }
         #endregion
         #region Sample_TestCode
@@ -31,7 +31,7 @@ public void IsPrime_ValuesLessThan2_ReturnFalse(int value)
         {
             var result = _primeService.IsPrime(value);
 
-            Assert.IsFalse(result, $"{value} should not be prime");
+            Assert.That(result, Is.False, $"{value} should not be prime");
         }
         #endregion
     }

diff --git a/.../getting-started/unit-testing-vb-dotnet-test/PrimeService.Tests/PrimeService.Tests.vbproj b/.../getting-started/unit-testing-vb-dotnet-test/PrimeService.Tests/PrimeService.Tests.vbproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/core/getting-started/unit-testing-vb-mstest/PrimeService.Tests/PrimeService.Tests.vbproj b/core/getting-started/unit-testing-vb-mstest/PrimeService.Tests/PrimeService.Tests.vbproj
@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
   </ItemGroup>
 

diff --git a/core/getting-started/unit-testing-vb-nunit/PrimeService.Tests/PrimeService.Tests.vbproj b/core/getting-started/unit-testing-vb-nunit/PrimeService.Tests/PrimeService.Tests.vbproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/core/getting-started/unit-testing-vb-nunit/PrimeService.Tests/PrimeService_IsPrimeShould.vb b/core/getting-started/unit-testing-vb-nunit/PrimeService.Tests/PrimeService_IsPrimeShould.vb
@@ -1,6 +1,7 @@
 Imports NUnit.Framework
 
 Namespace PrimeService.Tests
+
     '<Sample_TestCode>
     <TestFixture>
     Public Class PrimeService_IsPrimeShould
@@ -12,7 +13,7 @@ Namespace PrimeService.Tests
         Sub IsPrime_ValuesLessThan2_ReturnFalse(value As Integer)
             Dim result As Boolean = _primeService.IsPrime(value)
 
-            Assert.IsFalse(result, $"{value} should not be prime")
+            Assert.That(result, [Is].False, $"{value} should not be prime")
         End Sub
 
         <TestCase(2)>
@@ -22,7 +23,7 @@ Namespace PrimeService.Tests
         Public Sub IsPrime_PrimesLessThan10_ReturnTrue(value As Integer)
             Dim result As Boolean = _primeService.IsPrime(value)
 
-            Assert.IsTrue(result, $"{value} should be prime")
+            Assert.That(result, [Is].True, $"{value} should be prime")
         End Sub
 
         <TestCase(4)>
@@ -32,8 +33,10 @@ Namespace PrimeService.Tests
         Public Sub IsPrime_NonPrimesLessThan10_ReturnFalse(value As Integer)
             Dim result As Boolean = _primeService.IsPrime(value)
 
-            Assert.IsFalse(result, $"{value} should not be prime")
+            Assert.That(result, [Is].False, $"{value} should not be prime")
         End Sub
+
     End Class
+
     '</Sample_TestCode>
 End Namespace
diff --git a/...etting-started/unit-testing-with-fsharp-mstest/MathService.Tests/MathService.Tests.fsproj b/...etting-started/unit-testing-with-fsharp-mstest/MathService.Tests/MathService.Tests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest" Version="3.2.2" />
+    <PackageReference Include="MSTest" Version="3.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...getting-started/unit-testing-with-fsharp-nunit/MathService.Tests/MathService.Tests.fsproj b/...getting-started/unit-testing-with-fsharp-nunit/MathService.Tests/MathService.Tests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/core/getting-started/unit-testing-with-fsharp-nunit/MathService.Tests/Tests.fs b/core/getting-started/unit-testing-with-fsharp-nunit/MathService.Tests/Tests.fs
@@ -7,11 +7,10 @@ open MathService
 
 [<Test>]
 let ``My test`` () =
-    Assert.True(true)
+    Assert.That(true, Is.True)
 
 //[<Test>]
-//let ``Fail every time`` () = Assert.True(false)
-
+//let ``Fail every time`` () = Assert.That(false, Is.True)
 
 [<Test>]
 let ``Sequence of Evens returns empty collection`` () =

diff --git a/core/getting-started/unit-testing-with-fsharp/MathService.Tests/MathService.Tests.fsproj b/core/getting-started/unit-testing-with-fsharp/MathService.Tests/MathService.Tests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/core/getting-started/unit-testing-with-fsharp/MathService.Tests/Tests.fs b/core/getting-started/unit-testing-with-fsharp/MathService.Tests/Tests.fs
@@ -12,7 +12,6 @@ let ``My test`` () =
 //[<Fact>]
 //let ``Fail every time`` () = Assert.True(false)
 
-
 [<Fact>]
 let ``Sequence of Evens returns empty collection`` () =
     let expected = Seq.empty<int>

diff --git a/csharp/roslyn-sdk/Tutorials/MakeConst/MakeConst.Test/MakeConst.Test.csproj b/csharp/roslyn-sdk/Tutorials/MakeConst/MakeConst.Test/MakeConst.Test.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest" Version="3.2.2" />
+    <PackageReference Include="MSTest" Version="3.3.0" />
     <PackageReference Include="Microsoft.CodeAnalysis" Version="4.9.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest" Version="1.1.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest" Version="1.1.1" />