diff --git a/.gitignore b/.gitignore
index a60847fe2d..bcc1b3137d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,12 +3,18 @@ InitTestScene*
 *.orig
 *.orig.meta
 .vs/
+.vsconfig
 Assets/Plugins/Editor/JetBrains
 Assets/Plugins/Editor/JetBrains.meta
-Builds/
-Logs/
-Library/
-Temp/
+
+/[Ll]ibrary/
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild/
+/[Bb]uilds/
+/[Ll]ogs/
+/[Uu]ser[Ss]ettings/
+
 *.sln
 *.sln*user
 *.csproj
diff --git a/Assets/TextMesh Pro/Sprites/EmojiOne.json.meta b/Assets/TextMesh Pro/Sprites/EmojiOne.json.meta
new file mode 100644
index 0000000000..d1c29ac252
--- /dev/null
+++ b/Assets/TextMesh Pro/Sprites/EmojiOne.json.meta	
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4d96380df90719244a4ed4b9f7edbe03
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/LICENSE.md b/LICENSE.md
index 2de9fa2402..b7f9f7ae60 100755
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Input System © 2022 Unity Technologies
+Input System © 2023 Unity Technologies
 
 Licensed under the Unity Companion License for Unity-dependent projects (see [https://unity3d.com/legal/licenses/unity_companion_license](https://unity3d.com/legal/licenses/unity_companion_license)).
 
diff --git a/Packages/com.unity.inputsystem/LICENSE.md b/Packages/com.unity.inputsystem/LICENSE.md
index 2de9fa2402..b7f9f7ae60 100755
--- a/Packages/com.unity.inputsystem/LICENSE.md
+++ b/Packages/com.unity.inputsystem/LICENSE.md
@@ -1,4 +1,4 @@
-Input System © 2022 Unity Technologies
+Input System © 2023 Unity Technologies
 
 Licensed under the Unity Companion License for Unity-dependent projects (see [https://unity3d.com/legal/licenses/unity_companion_license](https://unity3d.com/legal/licenses/unity_companion_license)).
 
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 295e0cc708..d844023ba9 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,17 +1,17 @@
 {
   "dependencies": {
-    "com.unity.analytics": "3.3.5",
+    "com.unity.analytics": "3.6.12",
     "com.unity.cinemachine": "2.3.4",
     "com.unity.coding": "0.1.0-preview.24",
-    "com.unity.ide.rider": "1.1.4",
-    "com.unity.ide.vscode": "1.2.3",
+    "com.unity.ide.rider": "1.2.1",
+    "com.unity.ide.visualstudio": "2.0.15",
     "com.unity.probuilder": "4.2.3",
     "com.unity.settings-manager": "1.0.3",
     "com.unity.test-framework": "1.1.33",
     "com.unity.test-framework.build": "0.0.1-preview.12",
     "com.unity.test-framework.performance": "2.3.1-preview",
     "com.unity.test-framework.utp-reporter": "1.0.2-preview",
-    "com.unity.textmeshpro": "2.1.3",
+    "com.unity.textmeshpro": "2.1.4",
     "com.unity.ugui": "1.0.0",
     "nuget.mono-cecil": "0.1.6-preview",
     "com.unity.modules.ai": "1.0.0",
diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset
new file mode 100644
index 0000000000..6920e3adbb
--- /dev/null
+++ b/ProjectSettings/PackageManagerSettings.asset
@@ -0,0 +1,38 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ScopedRegistriesSettingsExpanded: 1
+  oneTimeWarningShown: 0
+  m_Registries:
+  - m_Id: main
+    m_Name: 
+    m_Url: https://packages.unity.com
+    m_Scopes: []
+    m_IsDefault: 1
+  m_UserSelectedRegistryName: 
+  m_UserAddingNewScopedRegistry: 0
+  m_RegistryInfoDraft:
+    m_ErrorMessage: 
+    m_Original:
+      m_Id: 
+      m_Name: 
+      m_Url: 
+      m_Scopes: []
+      m_IsDefault: 0
+    m_Modified: 0
+    m_Name: 
+    m_Url: 
+    m_Scopes:
+    - 
+    m_SelectedScopeIndex: 0
diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
index c2f94d8532..eaf34fe5f7 100644
--- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json
+++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
@@ -94,7 +94,7 @@
                 "value": "{\"m_Value\":{\"instanceID\":0}}"
             },
             {
-                "type": "UnityEditor.StaticEditorFlags, UnityEditor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "type": "UnityEditor.StaticEditorFlags, UnityEditor.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "mesh.defaultStaticEditorFlags",
                 "value": "{\"m_Value\":0}"
             },
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index d8ee6b5ae0..4c191298a5 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.18f1
-m_EditorVersionWithRevision: 2019.4.18f1 (3310a4d4f880)
+m_EditorVersion: 2019.4.40f1
+m_EditorVersionWithRevision: 2019.4.40f1 (ffc62b691db5)