Skip to content

Commit b88fddf

Browse files
committed
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dogfooding
* feature/bump-2021: removing file that should be in user settings according to this bug https://youtrack.jetbrains.com/issue/RIDER-76195 bumping Rider package to this new version in the ticket revert adding VP and RNSM to package-lock setting package-lock as non LFS dunno why this was updated automatically, this isn't findable... reverting that change
2 parents 3e01ede + 26d7e37 commit b88fddf

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

Packages/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"com.unity.ai.navigation.components": "https://github.com/Unity-Technologies/NavMeshComponents.git#package",
55
"com.unity.cinemachine": "2.8.4",
66
"com.unity.collab-proxy": "1.15.15",
7-
"com.unity.ide.rider": "3.0.13",
7+
"com.unity.ide.rider": "3.0.14",
88
"com.unity.ide.visualstudio": "2.0.14",
99
"com.unity.ide.vscode": "1.2.5",
1010
"com.unity.learn.iet-framework": "2.1.1",
1111
"com.unity.memoryprofiler": "0.5.0-preview.1",
1212
"com.unity.multiplayer.tools": "1.0.0-pre.6",
1313
"com.unity.netcode.gameobjects": "1.0.0-pre.7",
1414
"com.unity.postprocessing": "3.2.1",
15-
"com.unity.render-pipelines.universal": "12.1.6",
15+
"com.unity.render-pipelines.universal": "12.1.5",
1616
"com.unity.services.authentication": "1.0.0-pre.4",
1717
"com.unity.services.lobby": "1.0.0-pre.6",
1818
"com.unity.services.relay": "1.0.1-pre.5",

Packages/packages-lock.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"hash": "0fc6f532e4f47d66d173314efcb906bc7cf0d00f"
1717
},
1818
"com.unity.burst": {
19-
"version": "1.6.5",
19+
"version": "1.6.4",
2020
"depth": 1,
2121
"source": "registry",
2222
"dependencies": {
@@ -65,7 +65,7 @@
6565
"url": "https://packages.unity.com"
6666
},
6767
"com.unity.ide.rider": {
68-
"version": "3.0.13",
68+
"version": "3.0.14",
6969
"depth": 0,
7070
"source": "registry",
7171
"dependencies": {
@@ -174,14 +174,14 @@
174174
"url": "https://packages.unity.com"
175175
},
176176
"com.unity.profiling.core": {
177-
"version": "1.0.2",
177+
"version": "1.0.0",
178178
"depth": 1,
179179
"source": "registry",
180180
"dependencies": {},
181181
"url": "https://packages.unity.com"
182182
},
183183
"com.unity.render-pipelines.core": {
184-
"version": "12.1.6",
184+
"version": "12.1.5",
185185
"depth": 1,
186186
"source": "builtin",
187187
"dependencies": {
@@ -191,14 +191,14 @@
191191
}
192192
},
193193
"com.unity.render-pipelines.universal": {
194-
"version": "12.1.6",
194+
"version": "12.1.5",
195195
"depth": 0,
196196
"source": "builtin",
197197
"dependencies": {
198198
"com.unity.mathematics": "1.2.1",
199199
"com.unity.burst": "1.5.0",
200-
"com.unity.render-pipelines.core": "12.1.6",
201-
"com.unity.shadergraph": "12.1.6"
200+
"com.unity.render-pipelines.core": "12.1.5",
201+
"com.unity.shadergraph": "12.1.5"
202202
}
203203
},
204204
"com.unity.searcher": {
@@ -270,11 +270,11 @@
270270
"url": "https://packages.unity.com"
271271
},
272272
"com.unity.shadergraph": {
273-
"version": "12.1.6",
273+
"version": "12.1.5",
274274
"depth": 1,
275275
"source": "builtin",
276276
"dependencies": {
277-
"com.unity.render-pipelines.core": "12.1.6",
277+
"com.unity.render-pipelines.core": "12.1.5",
278278
"com.unity.searcher": "4.9.1"
279279
}
280280
},

ProjectSettings/RiderScriptEditorPersistedState.asset

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)