Skip to content

update version number and license file year in preparation for beta2 release #3401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-c-kline merged 2 commits into from
Feb 5, 2019
Merged

update version number and license file year in preparation for beta2 release #3401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea86d3f
update to unity 2018.3.4
Feb 2, 2019
5763e43
update version, license file year
Feb 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/MixedRealityToolkit.Examples/License.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Microsoft Corporation
Copyright (c) 2019 Microsoft Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 0 additions & 3 deletions Assets/MixedRealityToolkit.Examples/README.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Assets/MixedRealityToolkit.Examples/Version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Mixed Reality Toolkit 2018.9.0 (BETA)
Mixed Reality Toolkit 2.0.0-Beta2
2 changes: 1 addition & 1 deletion Assets/MixedRealityToolkit.Examples/Version.txt.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions Assets/MixedRealityToolkit.Providers/License.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2019 Microsoft Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
2 changes: 1 addition & 1 deletion ...xedRealityToolkit.Examples/README.md.meta → ...RealityToolkit.Providers/License.txt.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Assets/MixedRealityToolkit.Providers/Version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Mixed Reality Toolkit 2.0.0-Beta2
2 changes: 1 addition & 1 deletion ...ts/MixedRealityToolkit.SDK/README.md.meta → ...RealityToolkit.Providers/Version.txt.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/MixedRealityToolkit.SDK/License.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Microsoft Corporation
Copyright (c) 2019 Microsoft Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 0 additions & 3 deletions Assets/MixedRealityToolkit.SDK/README.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Assets/MixedRealityToolkit.SDK/Version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Mixed Reality Toolkit 2018.9.0 (BETA)
Mixed Reality Toolkit 2.0.0-Beta2
2 changes: 1 addition & 1 deletion Assets/MixedRealityToolkit.SDK/Version.txt.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions Assets/MixedRealityToolkit.Services/License.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2019 Microsoft Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
7 changes: 7 additions & 0 deletions Assets/MixedRealityToolkit.Services/License.txt.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Assets/MixedRealityToolkit.Services/Version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Mixed Reality Toolkit 2.0.0-Beta2
7 changes: 7 additions & 0 deletions Assets/MixedRealityToolkit.Services/Version.txt.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/MixedRealityToolkit.Tests/License.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Microsoft Corporation
Copyright (c) 2019 Microsoft Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Assets/MixedRealityToolkit.Tests/Version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Mixed Reality Toolkit 2018.9.0 (BETA)
Mixed Reality Toolkit 2.0.0-Beta2
2 changes: 1 addition & 1 deletion Assets/MixedRealityToolkit.Tests/Version.txt.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/MixedRealityToolkit/License.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Microsoft Corporation
Copyright (c) 2019 Microsoft Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Assets/MixedRealityToolkit/Version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Mixed Reality Toolkit 2018.9.0 (BETA)
Mixed Reality Toolkit 2.0.0-Beta2
13 changes: 10 additions & 3 deletions ProjectSettings/ProjectSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 2018.0.0.0
bundleVersion: 2.0.0-Beta2
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
Expand Down Expand Up @@ -580,7 +580,7 @@ PlayerSettings:
m_RenderingPath: 1
m_MobileRenderingPath: 1
metroPackageName: Microsoft.MixedReality.Toolkit
metroPackageVersion: 2018.9.0.0
metroPackageVersion: 2.0.0.0
Copy link
Contributor

@keveleigh keveleigh Feb 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any way to differentiate this as a beta?

Copy link
Author

@david-c-kline david-c-kline Feb 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the UWP version number. to the best of my knowledge, it must be all integers

metroCertificatePath: Assets/WSATestCertificate.pfx
metroCertificatePassword:
metroCertificateSubject: Microsoft
Expand Down Expand Up @@ -640,7 +640,14 @@ PlayerSettings:
VideosLibrary: False
VoipCall: False
WebCam: False
metroTargetDeviceFamilies: {}
metroTargetDeviceFamilies:
Desktop: False
Holographic: False
IoT: False
IoTHeadless: False
Mobile: False
Team: False
Xbox: False
metroFTAName:
metroFTAFileTypes: []
metroProtocolName:
Expand Down
2 changes: 1 addition & 1 deletion ProjectSettings/ProjectVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
m_EditorVersion: 2018.3.3f1
m_EditorVersion: 2018.3.4f1