Merge branch 'unity6-nunit'

Rabadash8820 · Jul 17, 2024 · 85e61cb · 85e61cb
2 parents 4b70678 + 4203237
commit 85e61cb
Show file tree

Hide file tree

Showing 39 changed files with 3,865 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,18 @@ All notable changes to the [Unity3D NuGet package](https://www.nuget.org/package
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 3.0.0 - 2024-07-16
+
+Download from [GitHub Releases](https://github.com/Rabadash8820/UnityAssemblies/releases/tag/v3.0.0-rc2) or [nuget.org](https://www.nuget.org/packages/Unity3D/3.0.0-rc2).
+
+### Added in 3.0.0
+
+- Internal: test project for Unity 6 Beta release
+
+### Fixed in 3.0.0
+
+- `NUnityAssembly` value for Unity 6+ projects
+
 ## 3.0.0-rc1 - 2024-07-16
 
 Download from [GitHub Releases](https://github.com/Rabadash8820/UnityAssemblies/releases/tag/v3.0.0-rc1) or [nuget.org](https://www.nuget.org/packages/Unity3D/3.0.0-rc1).

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 [![NuGet package](https://img.shields.io/nuget/v/Unity3D.svg)](https://nuget.org/packages/Unity3D)
 [![NuGet downloads](https://img.shields.io/packagecontrol/dd/Unity3D.svg)](https://nuget.org/packages/Unity3D)
-[![Changelog (currently v3.0.0-rc1)](https://img.shields.io/badge/changelog-v3.0.0-rc1-blue.svg)](./CHANGELOG.md)
+[![Changelog (currently v3.0.0)](https://img.shields.io/badge/changelog-v3.0.0-blue.svg)](./CHANGELOG.md)
 [![License](https://img.shields.io/github/license/Rabadash8820/UnityAssemblies.svg)](./LICENSE)
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](./CODE_OF_CONDUCT.md)
 [![Issues closed](https://img.shields.io/github/issues-closed/Rabadash8820/UnityAssemblies)](https://github.com/Rabadash8820/UnityAssemblies/issues)

diff --git a/docs/v3/short-hand-properties.md b/docs/v3/short-hand-properties.md
@@ -72,7 +72,7 @@ For example, you could reference both `org.nuget.microsoft.extensions.logging%40
 | `UnityEditoriOSExtensionsXcodePath` | `$(UnityiOSSupportPath)\UnityEditor.iOS.Extensions.Xcode.dll` | See types under `UnityEditor > UnityEditor.iOS` in the [Unity Scripting API docs](https://docs.unity3d.com/ScriptReference/index.html) |
 | `NewtonsoftJsonAssembly` | `com.unity.nuget.newtonsoft-json%40*\Runtime\Newtonsoft.Json.dll` | Requires installation of the [Performance Testing Extension](https://docs.unity3d.com/Packages/com.unity.test-framework.performance@latest/index.html) for Unity Test Runner package. Referenced by `NewtonsoftJsonPath`. Only defined if `UnityVersion` is between 2019.3 and 2022.1, inclusive. |
 | `NewtonsoftJsonPath` | `$(UnityPackageCachePath)\$(NewtonsoftJsonAssembly)` for Unity 2019.3-2022.1, `$(UnityManagedPath)\Newtonsoft.Json.dll` for Unity 2022.2+ | In Unity 2019.3-2022.1, requires installation of the [Performance Testing Extension](https://docs.unity3d.com/Packages/com.unity.test-framework.performance@latest/index.html) for Unity Test Runner package. No extra installations required in Unity 2022.2+. |
-| `NunitAssembly` | `com.unity.ext.nunit%40*\net35\unity-custom\nunit.framework.dll` | Requires installation of the [Test Framework](https://docs.unity3d.com/Packages/com.unity.test-framework@latest/index.html) package. Referenced by `NunitPath`. Only defined if `UnityVersion` is >= 2019.2. |
+| `NunitAssembly` | `com.unity.ext.nunit%40*\net*\unity-custom\nunit.framework.dll` for Unity 2023.2 and below, `com.unity.ext.nunit\net*\unity-custom\nunit.framework.dll` for Unity 6+ | Requires installation of the [Test Framework](https://docs.unity3d.com/Packages/com.unity.test-framework@latest/index.html) package. Referenced by `NunitPath`. Only defined if `UnityVersion` is >= 2019.2. |
 | `NunitPath` | `$(UnityPackageCachePath)\$(NunitAssembly)` | Requires installation of the [Test Framework](https://docs.unity3d.com/Packages/com.unity.test-framework@latest/index.html) package. Only defined if `UnityVersion` is >= 2019.2. |
 | `MoqAssembly` | `nuget.moq%40*\Moq.dll` | Requires installation of the [Test Framework](https://docs.unity3d.com/Packages/com.unity.test-framework@latest/index.html) package. In Unity 2020.1+, [download Moq from NuGet](https://www.nuget.org/packages/moq/) and import it as a managed plugin. Referenced by `MoqPath`. Only defined if `UnityVersion` is between 2019.2 and 2019.3, inclusive. |
 | `MoqPath` | `$(UnityPackageCachePath)\$(MoqAssembly)` | Requires installation of the [Test Framework](https://docs.unity3d.com/Packages/com.unity.test-framework@latest/index.html) package. In Unity 2020.1+, [download Moq from NuGet](https://www.nuget.org/packages/moq/) and import it as a managed plugin. Only defined if `UnityVersion` is between 2019.2 and 2019.3, inclusive. |

diff --git a/nupkg/Unity3D.nuspec b/nupkg/Unity3D.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
   <metadata minClientVersion="2.5">
     <id>Unity3D</id>
-    <version>3.0.0-rc1</version>
+    <version>3.0.0</version>
     <title>Unity</title>
     <authors>Unity Technologies</authors>
     <icon>icon.png</icon>

diff --git a/nupkg/build/Unity3D.targets b/nupkg/build/Unity3D.targets
@@ -117,7 +117,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(UnityVersionAsNumber)'>='2019.2'">
     <!-- There is only ever one framework version in this UPM package, so the "net*" part is okay -->
-    <NunitAssembly Condition="'$(NunitAssembly)'==''">com.unity.ext.nunit%40*\net*\unity-custom\nunit.framework.dll</NunitAssembly>
+    <NunitAssembly Condition="'$(NunitAssembly)'=='' And '$(UnityVersionAsNumber)'&lt;'6000.0'">com.unity.ext.nunit%40*\net*\unity-custom\nunit.framework.dll</NunitAssembly>
+    <NunitAssembly Condition="'$(NunitAssembly)'=='' And '$(UnityVersionAsNumber)'>='6000.0'">com.unity.ext.nunit\net*\unity-custom\nunit.framework.dll</NunitAssembly>
     <NunitPath Condition="'$(NunitPath)'==''">$(UnityPackageCachePath)\$(NunitAssembly)</NunitPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(UnityVersionAsNumber)'=='2019.2' Or '$(UnityVersionAsNumber)'=='2019.3'">

diff --git a/nupkg/readme.txt b/nupkg/readme.txt
@@ -29,7 +29,7 @@ To use this package, add lines like the following to your .csproj file (or any i
             <UnityProjectPath>$(MSBuildProjectDirectory)\relative\path\to\UnityProject</UnityProjectPath>
         </PropertyGroup>
         <ItemGroup>
-            <PackageReference Include="Unity3D" Version="3.0.0-rc1" />
+            <PackageReference Include="Unity3D" Version="3.0.0" />
         </ItemGroup>
     </Project>
 

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <Configurations>
+      Standard21_6000_0;Net472_6000_0;Net48_6000_0;
       Standard21_2023_2;Net472_2023_2;Net48_2023_2;
       Standard21_2023_1;Net472_2023_1;Net48_2023_1;
       Standard21_2022_3;Net472_2022_3;Net48_2022_3;

diff --git a/test/Unity3DTests.sln b/test/Unity3DTests.sln
@@ -59,14 +59,17 @@ Global
 		Net472_2022_3|Any CPU = Net472_2022_3|Any CPU
 		Net472_2023_1|Any CPU = Net472_2023_1|Any CPU
 		Net472_2023_2|Any CPU = Net472_2023_2|Any CPU
+		Net472_6000_0|Any CPU = Net472_6000_0|Any CPU
 		Net48_2021_3|Any CPU = Net48_2021_3|Any CPU
 		Net48_2022_3|Any CPU = Net48_2022_3|Any CPU
 		Net48_2023_1|Any CPU = Net48_2023_1|Any CPU
 		Net48_2023_2|Any CPU = Net48_2023_2|Any CPU
+		Net48_6000_0|Any CPU = Net48_6000_0|Any CPU
 		Standard21_2021_3|Any CPU = Standard21_2021_3|Any CPU
 		Standard21_2022_3|Any CPU = Standard21_2022_3|Any CPU
 		Standard21_2023_1|Any CPU = Standard21_2023_1|Any CPU
 		Standard21_2023_2|Any CPU = Standard21_2023_2|Any CPU
+		Standard21_6000_0|Any CPU = Standard21_6000_0|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net472_2021_3|Any CPU.ActiveCfg = Net472_2021_3|Any CPU
@@ -77,6 +80,8 @@ Global
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net472_2023_1|Any CPU.Build.0 = Net472_2023_1|Any CPU
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net472_2023_2|Any CPU.ActiveCfg = Net472_2023_2|Any CPU
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net472_2023_2|Any CPU.Build.0 = Net472_2023_2|Any CPU
+		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net472_6000_0|Any CPU.ActiveCfg = Net472_6000_0|Any CPU
+		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net472_6000_0|Any CPU.Build.0 = Net472_6000_0|Any CPU
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net48_2021_3|Any CPU.ActiveCfg = Net48_2021_3|Any CPU
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net48_2021_3|Any CPU.Build.0 = Net48_2021_3|Any CPU
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net48_2022_3|Any CPU.ActiveCfg = Net48_2022_3|Any CPU
@@ -85,6 +90,8 @@ Global
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net48_2023_1|Any CPU.Build.0 = Net48_2023_1|Any CPU
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net48_2023_2|Any CPU.ActiveCfg = Net48_2023_2|Any CPU
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net48_2023_2|Any CPU.Build.0 = Net48_2023_2|Any CPU
+		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net48_6000_0|Any CPU.ActiveCfg = Net48_6000_0|Any CPU
+		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Net48_6000_0|Any CPU.Build.0 = Net48_6000_0|Any CPU
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Standard21_2021_3|Any CPU.ActiveCfg = Standard21_2021_3|Any CPU
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Standard21_2021_3|Any CPU.Build.0 = Standard21_2021_3|Any CPU
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Standard21_2022_3|Any CPU.ActiveCfg = Standard21_2022_3|Any CPU
@@ -93,6 +100,8 @@ Global
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Standard21_2023_1|Any CPU.Build.0 = Standard21_2023_1|Any CPU
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Standard21_2023_2|Any CPU.ActiveCfg = Standard21_2023_2|Any CPU
 		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Standard21_2023_2|Any CPU.Build.0 = Standard21_2023_2|Any CPU
+		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Standard21_6000_0|Any CPU.ActiveCfg = Standard21_6000_0|Any CPU
+		{FAF7AFF4-8E1F-4D41-A4B8-24BE2715C89A}.Standard21_6000_0|Any CPU.Build.0 = Standard21_6000_0|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net472_2021_3|Any CPU.ActiveCfg = Net472_2021_3|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net472_2021_3|Any CPU.Build.0 = Net472_2021_3|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net472_2022_3|Any CPU.ActiveCfg = Net472_2022_3|Any CPU
@@ -101,6 +110,8 @@ Global
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net472_2023_1|Any CPU.Build.0 = Net472_2023_1|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net472_2023_2|Any CPU.ActiveCfg = Net472_2023_2|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net472_2023_2|Any CPU.Build.0 = Net472_2023_2|Any CPU
+		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net472_6000_0|Any CPU.ActiveCfg = Net472_6000_0|Any CPU
+		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net472_6000_0|Any CPU.Build.0 = Net472_6000_0|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net48_2021_3|Any CPU.ActiveCfg = Net48_2021_3|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net48_2021_3|Any CPU.Build.0 = Net48_2021_3|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net48_2022_3|Any CPU.ActiveCfg = Net48_2022_3|Any CPU
@@ -109,6 +120,8 @@ Global
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net48_2023_1|Any CPU.Build.0 = Net48_2023_1|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net48_2023_2|Any CPU.ActiveCfg = Net48_2023_2|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net48_2023_2|Any CPU.Build.0 = Net48_2023_2|Any CPU
+		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net48_6000_0|Any CPU.ActiveCfg = Net48_6000_0|Any CPU
+		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Net48_6000_0|Any CPU.Build.0 = Net48_6000_0|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Standard21_2021_3|Any CPU.ActiveCfg = Standard21_2021_3|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Standard21_2021_3|Any CPU.Build.0 = Standard21_2021_3|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Standard21_2022_3|Any CPU.ActiveCfg = Standard21_2022_3|Any CPU
@@ -117,6 +130,8 @@ Global
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Standard21_2023_1|Any CPU.Build.0 = Standard21_2023_1|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Standard21_2023_2|Any CPU.ActiveCfg = Standard21_2023_2|Any CPU
 		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Standard21_2023_2|Any CPU.Build.0 = Standard21_2023_2|Any CPU
+		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Standard21_6000_0|Any CPU.ActiveCfg = Standard21_6000_0|Any CPU
+		{7C22AA1F-E1E9-4592-BBB5-06E2DF7E74D4}.Standard21_6000_0|Any CPU.Build.0 = Standard21_6000_0|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net472_2021_3|Any CPU.ActiveCfg = Net472_2021_3|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net472_2021_3|Any CPU.Build.0 = Net472_2021_3|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net472_2022_3|Any CPU.ActiveCfg = Net472_2022_3|Any CPU
@@ -125,6 +140,8 @@ Global
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net472_2023_1|Any CPU.Build.0 = Net472_2023_1|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net472_2023_2|Any CPU.ActiveCfg = Net472_2023_2|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net472_2023_2|Any CPU.Build.0 = Net472_2023_2|Any CPU
+		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net472_6000_0|Any CPU.ActiveCfg = Net472_6000_0|Any CPU
+		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net472_6000_0|Any CPU.Build.0 = Net472_6000_0|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net48_2021_3|Any CPU.ActiveCfg = Net48_2021_3|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net48_2021_3|Any CPU.Build.0 = Net48_2021_3|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net48_2022_3|Any CPU.ActiveCfg = Net48_2022_3|Any CPU
@@ -133,6 +150,8 @@ Global
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net48_2023_1|Any CPU.Build.0 = Net48_2023_1|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net48_2023_2|Any CPU.ActiveCfg = Net48_2023_2|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net48_2023_2|Any CPU.Build.0 = Net48_2023_2|Any CPU
+		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net48_6000_0|Any CPU.ActiveCfg = Net48_6000_0|Any CPU
+		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Net48_6000_0|Any CPU.Build.0 = Net48_6000_0|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Standard21_2021_3|Any CPU.ActiveCfg = Standard21_2021_3|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Standard21_2021_3|Any CPU.Build.0 = Standard21_2021_3|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Standard21_2022_3|Any CPU.ActiveCfg = Standard21_2022_3|Any CPU
@@ -141,6 +160,8 @@ Global
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Standard21_2023_1|Any CPU.Build.0 = Standard21_2023_1|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Standard21_2023_2|Any CPU.ActiveCfg = Standard21_2023_2|Any CPU
 		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Standard21_2023_2|Any CPU.Build.0 = Standard21_2023_2|Any CPU
+		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Standard21_6000_0|Any CPU.ActiveCfg = Standard21_6000_0|Any CPU
+		{4EFD5237-59D1-431D-A60A-A8B1D397AC1B}.Standard21_6000_0|Any CPU.Build.0 = Standard21_6000_0|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/test/UnityVersion.props b/test/UnityVersion.props
@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <UnityVersion Condition="'$(ConfigurationVersionNum)'=='60000'">6000.0.0b13</UnityVersion>
     <UnityVersion Condition="'$(ConfigurationVersionNum)'=='20232'">2023.2.1f1</UnityVersion>
     <UnityVersion Condition="'$(ConfigurationVersionNum)'=='20231'">2023.1.8f1</UnityVersion>
     <UnityVersion Condition="'$(ConfigurationVersionNum)'=='20223'">2022.3.16f1</UnityVersion>