Skip to content

Commit 95ab614

Browse files
author
davidkline-ms
committed
fix incorrect file name, add offline docs, update scripts
1 parent 4760d24 commit 95ab614

File tree

5 files changed

+19
-4
lines changed

5 files changed

+19
-4
lines changed

Assets/MRTK/Examples/packagetemplate.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@
2929
},
3030
"files": [
3131
"Common*",
32-
"Samples~*",
3332
"StandardAssets*",
3433
"Microsoft.MixedReality.Toolkit.Examples*",
3534
"MRTK.Examples*",
3635
"package.json.meta",
3736
"LICENSE*",
3837
"NOTICE*",
39-
"CHANGELOG*"
38+
"CHANGELOG*",
39+
"Documentation~*",
40+
"Samples~*"
4041
],
4142
%samples%
4243
}

Assets/MRTK/packagetemplate.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"LICENSE*",
3636
"NOTICE*",
3737
"CHANGELOG*",
38+
"Documentation~*",
3839
"Samples~"
3940
],
4041
"samples": [

UPM/Documentation~/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Microsoft Mixed Reality Toolkit
2+
3+
[Getting Started](https://docs.microsoft.com/en-us/windows/mixed-reality/develop/unity/mrtk-getting-started)
4+
[MRTK Documentation on GitHub](https://microsoft.github.io/MixedRealityToolkit-Unity/README.html)
File renamed without changes.

scripts/packaging/createupmpackages.ps1

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,17 @@ foreach ($entry in $packages.GetEnumerator()) {
111111
# Create and publish the package
112112
$packageName = $entry.Name
113113

114+
$docFolder = "$packagePath/Documentation~"
115+
114116
# Copy files used by UPM to display license, change log, etc.
115117
Copy-Item -Path "$projectRoot/LICENSE.md" "$packagePath"
118+
Copy-Item -Path "$projectRoot/UPM/UnityMetaFiles/LICENSE.md.meta.$packageName" "$packagePath/LICENSE.md.meta"
116119
Copy-Item -Path "$projectRoot/NOTICE.md" "$packagePath"
120+
Copy-Item -Path "$projectRoot/UPM/UnityMetaFiles/NOTICE.md.meta.$packageName" "$packagePath/NOTICE.md.meta"
117121
Copy-Item -Path "$projectRoot/CHANGELOG.md" "$packagePath"
118-
Copy-Item -Path "$projectRoot/packaging/UnityMetaFiles/$packageName/*.meta" "$packagePath"
119-
122+
Copy-Item -Path "$projectRoot/UPM/UnityMetaFiles/CHANGELOG.md.meta.$packageName" "$packagePath/CHANGELOG.md.meta"
123+
Copy-Item -Path "$projectRoot/UPM/Documentation~" $docFolder -Recurse
124+
120125
$samplesFolder = "$packagePath/Samples~"
121126

122127
if ($packageName -eq "foundation") {
@@ -179,6 +184,10 @@ foreach ($entry in $packages.GetEnumerator()) {
179184
Remove-Item -Path "$packagePath/LICENSE.md*"
180185
Remove-Item -Path "$packagePath/NOTICE.md*"
181186
Remove-Item -Path "$packagePath/CHANGELOG.md*"
187+
if (Test-Path -Path $docFolder) {
188+
# A samples folder was created. Remove it.
189+
Remove-Item -Path $docFolder -Recurse -Force
190+
}
182191

183192
# Delete the renamed package.json.* files
184193
Remove-Item -Path "$packagePath/package.json"

0 commit comments

Comments
 (0)