Skip to content

Commit 766eba4

Browse files
authored
Merge pull request proyecto26#205 from dali-games/develop
Created asmdef for sample + moved the sample to unity recommended directory (Samples~ instead of sample)
2 parents 220b98b + 5a5d5f6 commit 766eba4

File tree

4 files changed

+31
-8
lines changed

4 files changed

+31
-8
lines changed

.github/workflows/ci.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
git branch -d upm &> /dev/null || echo upm branch not found # recreate the upm branch each time
1717
git mv "$PKG_ROOT" "src/$UPM_ROOT"
1818
git mv "src/$UPM_ROOT" .
19-
git mv demo/Assets demo/Sample
20-
git mv demo/Sample $UPM_ROOT
19+
git mv demo/Assets demo/Samples~
20+
git mv demo/Samples~ $UPM_ROOT
2121
git mv doc Docs
2222
git mv Docs $UPM_ROOT
2323
git mv LICENSE $UPM_ROOT
@@ -33,11 +33,11 @@ jobs:
3333
git commit -m "create release folder"
3434
git subtree split -P "$UPM_ROOT" -b upm # create the upm branch
3535
git checkout upm # checkout the branch
36-
if [[ -d "Sample/Packages" ]]; then
37-
git rm -rf Sample/Packages
38-
git rm Sample/Packages.meta --ignore-unmatch
39-
git rm Sample/packages.config
40-
git rm Sample/packages.config.meta --ignore-unmatch
36+
if [[ -d "Samples~/Packages" ]]; then
37+
git rm -rf Samples~/Packages
38+
git rm Samples~/Packages.meta --ignore-unmatch
39+
git rm Samples~/packages.config
40+
git rm Samples~/packages.config.meta --ignore-unmatch
4141
fi
4242
if [[ -d "Properties" ]]; then
4343
git rm -rf Properties
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"name": "Proyecto26.RestClient.Demo",
3+
"rootNamespace": "",
4+
"references": [
5+
"GUID:fbfbf4d8d5c249a458d69ae047a2fbd2"
6+
],
7+
"includePlatforms": [],
8+
"excludePlatforms": [],
9+
"allowUnsafeCode": false,
10+
"overrideReferences": false,
11+
"precompiledReferences": [],
12+
"autoReferenced": true,
13+
"defineConstraints": [],
14+
"versionDefines": [],
15+
"noEngineReferences": false
16+
}

demo/Assets/Proyecto26.RestClient.Demo.asmdef.meta

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Proyecto26.RestClient/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
{
3939
"displayName": "Sample",
4040
"description": "RestClient Sample",
41-
"path": "Sample"
41+
"path": "Samples~"
4242
}
4343
]
4444
}

0 commit comments

Comments
 (0)