From f2f780963d231d2590c36f1c04f4e3a81ae36b12 Mon Sep 17 00:00:00 2001 From: aaronchapin-tocaboca Date: Wed, 27 Oct 2021 15:37:58 +0200 Subject: [PATCH 1/6] Add files to support Unity Package Manager - Agones assembly definition - Package information - Meta files required for the engine --- sdks/unity/Agones.asmdef | 3 +++ sdks/unity/Agones.asmdef.meta | 7 +++++++ sdks/unity/AgonesSdk.cs.meta | 11 +++++++++++ sdks/unity/model.meta | 8 ++++++++ sdks/unity/model/GameServer.cs.meta | 11 +++++++++++ sdks/unity/model/GameServerObjectMeta.cs.meta | 11 +++++++++++ sdks/unity/model/GameServerSpec.cs.meta | 11 +++++++++++ sdks/unity/model/GameServerStatus.cs.meta | 11 +++++++++++ sdks/unity/model/SpecHealth.cs.meta | 11 +++++++++++ sdks/unity/model/StatusPort.cs.meta | 11 +++++++++++ sdks/unity/package.json | 11 +++++++++++ sdks/unity/package.json.meta | 7 +++++++ sdks/unity/third_party.meta | 8 ++++++++ sdks/unity/third_party/MiniJSON.cs.meta | 11 +++++++++++ 14 files changed, 132 insertions(+) create mode 100644 sdks/unity/Agones.asmdef create mode 100644 sdks/unity/Agones.asmdef.meta create mode 100644 sdks/unity/AgonesSdk.cs.meta create mode 100644 sdks/unity/model.meta create mode 100644 sdks/unity/model/GameServer.cs.meta create mode 100644 sdks/unity/model/GameServerObjectMeta.cs.meta create mode 100644 sdks/unity/model/GameServerSpec.cs.meta create mode 100644 sdks/unity/model/GameServerStatus.cs.meta create mode 100644 sdks/unity/model/SpecHealth.cs.meta create mode 100644 sdks/unity/model/StatusPort.cs.meta create mode 100644 sdks/unity/package.json create mode 100644 sdks/unity/package.json.meta create mode 100644 sdks/unity/third_party.meta create mode 100644 sdks/unity/third_party/MiniJSON.cs.meta diff --git a/sdks/unity/Agones.asmdef b/sdks/unity/Agones.asmdef new file mode 100644 index 0000000000..69efd6e9d9 --- /dev/null +++ b/sdks/unity/Agones.asmdef @@ -0,0 +1,3 @@ +{ + "name": "Agones" +} \ No newline at end of file diff --git a/sdks/unity/Agones.asmdef.meta b/sdks/unity/Agones.asmdef.meta new file mode 100644 index 0000000000..648f90e507 --- /dev/null +++ b/sdks/unity/Agones.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 842bf14b8e2ba45638e25dba28f03539 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdks/unity/AgonesSdk.cs.meta b/sdks/unity/AgonesSdk.cs.meta new file mode 100644 index 0000000000..553907ef5c --- /dev/null +++ b/sdks/unity/AgonesSdk.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b6741d5bd9b974d4c9054272525bdee5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdks/unity/model.meta b/sdks/unity/model.meta new file mode 100644 index 0000000000..d8dd99ded9 --- /dev/null +++ b/sdks/unity/model.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a51e28f6790a744cca4ff7f7551014b9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdks/unity/model/GameServer.cs.meta b/sdks/unity/model/GameServer.cs.meta new file mode 100644 index 0000000000..1646ece2a1 --- /dev/null +++ b/sdks/unity/model/GameServer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d221c617908824401891233f0cb2fd12 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdks/unity/model/GameServerObjectMeta.cs.meta b/sdks/unity/model/GameServerObjectMeta.cs.meta new file mode 100644 index 0000000000..a26e89de9d --- /dev/null +++ b/sdks/unity/model/GameServerObjectMeta.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a1eaf0f8f3f40478186387a7795e765f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdks/unity/model/GameServerSpec.cs.meta b/sdks/unity/model/GameServerSpec.cs.meta new file mode 100644 index 0000000000..fac109e1f8 --- /dev/null +++ b/sdks/unity/model/GameServerSpec.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b06d5fb5e12a4432eb54084b319163a7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdks/unity/model/GameServerStatus.cs.meta b/sdks/unity/model/GameServerStatus.cs.meta new file mode 100644 index 0000000000..bc3c908793 --- /dev/null +++ b/sdks/unity/model/GameServerStatus.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 71fba95d0288c47a8bca2f7cc4455df0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdks/unity/model/SpecHealth.cs.meta b/sdks/unity/model/SpecHealth.cs.meta new file mode 100644 index 0000000000..b2e9be2c84 --- /dev/null +++ b/sdks/unity/model/SpecHealth.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 440e595b400eb422fa23ef184dc80d48 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdks/unity/model/StatusPort.cs.meta b/sdks/unity/model/StatusPort.cs.meta new file mode 100644 index 0000000000..7d1a3963bf --- /dev/null +++ b/sdks/unity/model/StatusPort.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 33f4a78e60a1542d4a8d0829c31da0be +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdks/unity/package.json b/sdks/unity/package.json new file mode 100644 index 0000000000..5eba34019d --- /dev/null +++ b/sdks/unity/package.json @@ -0,0 +1,11 @@ +{ + "name": "com.googleforgames.agones", + "version": "1.0.0", + "displayName": "Agones Unity SDK", + "description": "The Unity Gameserver SDK for Agones", + "unity": "2019.1", + "author": { + "name": "Google For Games", + "url": "https://github.com/googleforgames/agones" + } + } \ No newline at end of file diff --git a/sdks/unity/package.json.meta b/sdks/unity/package.json.meta new file mode 100644 index 0000000000..3e21206942 --- /dev/null +++ b/sdks/unity/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 359685a0481644cc6933145965863f63 +PackageManifestImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdks/unity/third_party.meta b/sdks/unity/third_party.meta new file mode 100644 index 0000000000..57470233be --- /dev/null +++ b/sdks/unity/third_party.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1876674546da5431c9a4b01387223668 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdks/unity/third_party/MiniJSON.cs.meta b/sdks/unity/third_party/MiniJSON.cs.meta new file mode 100644 index 0000000000..762946a860 --- /dev/null +++ b/sdks/unity/third_party/MiniJSON.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 55e93ec681563450aad7d600efba1185 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 7873509064b31f6d610e9f7668d74b7bfd282faf Mon Sep 17 00:00:00 2001 From: aaronchapin-tocaboca Date: Wed, 27 Oct 2021 16:13:06 +0200 Subject: [PATCH 2/6] Update version number --- sdks/unity/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/unity/package.json b/sdks/unity/package.json index 5eba34019d..73fa489c66 100644 --- a/sdks/unity/package.json +++ b/sdks/unity/package.json @@ -1,6 +1,6 @@ { "name": "com.googleforgames.agones", - "version": "1.0.0", + "version": "1.18.1", "displayName": "Agones Unity SDK", "description": "The Unity Gameserver SDK for Agones", "unity": "2019.1", From c05ae952612a0375f2f16826224913cd16c47814 Mon Sep 17 00:00:00 2001 From: aaronchapin-tocaboca Date: Fri, 29 Oct 2021 11:40:00 +0200 Subject: [PATCH 3/6] Update author name --- sdks/unity/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/unity/package.json b/sdks/unity/package.json index 73fa489c66..d2d06e48b3 100644 --- a/sdks/unity/package.json +++ b/sdks/unity/package.json @@ -5,7 +5,7 @@ "description": "The Unity Gameserver SDK for Agones", "unity": "2019.1", "author": { - "name": "Google For Games", + "name": "Google LLC", "url": "https://github.com/googleforgames/agones" } } \ No newline at end of file From 931ce7d0ca1a1a47cea14aad338e24c5277d0818 Mon Sep 17 00:00:00 2001 From: aaronchapin-tocaboca Date: Mon, 1 Nov 2021 16:32:12 +0100 Subject: [PATCH 4/6] Add update step --- docs/governance/templates/release_issue.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/governance/templates/release_issue.md b/docs/governance/templates/release_issue.md index 30bfd7d967..f0616e6705 100644 --- a/docs/governance/templates/release_issue.md +++ b/docs/governance/templates/release_issue.md @@ -80,6 +80,7 @@ and copy it into a release issue. Fill in relevant values, found inside {} - [ ] If full release move the [helm `Chart` version values][chart] is to {version}+1-dev - [ ] If full release, change to the `sdks/nodejs` directory and run the command `npm version {version}+1-dev` to update the package version - [ ] If full release move the [`sdks/csharp/sdk/AgonesSDK.nuspec` and `sdks/csharp/sdk/csharp-sdk.csproj`][csharp] to {version}+1-dev +- [ ] If full release update the [`sdks/unity/package.json`][unity] package file's `Version` field to {version}+1-dev - [ ] If full release, remove `feature-freeze-do-not-merge` labels from all pull requests - [ ] Run `make gen-install gen-api-docs` - [ ] Create PR with these changes, and merge them with approval From c94f5adebcb77ad7d102c453e5d6498d841c3170 Mon Sep 17 00:00:00 2001 From: aaronchapin-tocaboca Date: Mon, 8 Nov 2021 13:41:27 +0100 Subject: [PATCH 5/6] Add step to Update SDK Package Versions section --- docs/governance/templates/release_issue.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/governance/templates/release_issue.md b/docs/governance/templates/release_issue.md index f0616e6705..62355a4113 100644 --- a/docs/governance/templates/release_issue.md +++ b/docs/governance/templates/release_issue.md @@ -38,6 +38,7 @@ and copy it into a release issue. Fill in relevant values, found inside {} - [ ] Update SDK Package Versions - [ ] Update the package version in [`sdks/nodejs/package.json`][package.json] and [`sdks/nodejs/package-lock.json`][package-lock.json] by running `npm version {version}` if a full release or `npm version {version}-rc` if release candidate - [ ] Ensure the [`sdks/csharp/sdk/AgonesSDK.nuspec` and `sdks/csharp/sdk/csharp-sdk.csproj`][csharp] versions are correct (should be {version} if a full release, {version}-rc if release candidate) + - [ ] Update the package version in the [`sdks/unity/package.json`][unity] package file's `Version` field to {version} if a full release, {version}-rc if release candidate - [ ] Run `make gen-install` - [ ] Run `make test-examples-on-gcr` to ensure all example images exist on gcr.io/agones-images- - [ ] Create a *draft* release with the [release template][release-template] From 1cb6f355fa4abc0420e4f695e7db82123af932fe Mon Sep 17 00:00:00 2001 From: aaronchapin-tocaboca Date: Fri, 12 Nov 2021 16:36:34 +0100 Subject: [PATCH 6/6] Updated client SDK documentation --- .../en/docs/Guides/Client SDKs/unity.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/site/content/en/docs/Guides/Client SDKs/unity.md b/site/content/en/docs/Guides/Client SDKs/unity.md index 1145002ab1..89d5c1af67 100644 --- a/site/content/en/docs/Guides/Client SDKs/unity.md +++ b/site/content/en/docs/Guides/Client SDKs/unity.md @@ -33,6 +33,25 @@ Additional methods have been added for ease of use: - Connect +{{% feature publishVersion="1.19.0" %}} +## Installation + +The client SDK code can be manually downloaded and added to your project hierarchy. + +It can also be imported into your project via the Unity Package Manager (UPM). To do that, open your project's `manifest.json` file, and add the following line to the dependencies section: + +``` +{ + "dependencies": { + "com.googleforgames.agones": "https://github.com/googleforgames/agones.git?path=/sdks/unity", +... +``` + +If you want a specific release, the dependency can be pinned to that version. For example: + +`"com.googleforgames.agones": "https://github.com/googleforgames/agones.git?path=/sdks/unity#1.19.0",` +{{% feature publishVersion="1.19.0" %}} + ## Download Download the source {{< ghlink href="sdks/unity" >}}directly from GitHub{{< /ghlink >}}.