forked from PrismLibrary/Prism
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'PrismLibrary/master' into Prism-NuSpec
Fixed Conflicts: Source/PrismLibrary_Win10.sln Source/Windows10/Prism.Unity.Windows/Prism.Unity.Windows.csproj Source/Windows10/Prism.Windows.Tests/Prism.Windows.Tests.csproj Source/Windows10/Prism.Windows/Prism.Windows.csproj
- Loading branch information
Showing
29 changed files
with
842 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -194,3 +194,7 @@ UpgradeLog*.htm | |
|
|
||
| # Microsoft Fakes | ||
| FakesAssemblies/ | ||
|
|
||
| # Security | ||
| *.pfx | ||
| *.snk | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
|
|
||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio 14 | ||
| VisualStudioVersion = 14.0.23107.0 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism", "Prism\Prism.csproj", "{E6C50355-D01E-4CAA-884D-D7929861315C}" | ||
| EndProject | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Tests", "Prism.Tests\Prism.Tests.csproj", "{B6E74918-D92B-4690-BEC9-0BB199A6E933}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Any CPU = Debug|Any CPU | ||
| Debug|ARM = Debug|ARM | ||
| Debug|x64 = Debug|x64 | ||
| Debug|x86 = Debug|x86 | ||
| Release|Any CPU = Release|Any CPU | ||
| Release|ARM = Release|ARM | ||
| Release|x64 = Release|x64 | ||
| Release|x86 = Release|x86 | ||
| Release-Signed|Any CPU = Release-Signed|Any CPU | ||
| Release-Signed|ARM = Release-Signed|ARM | ||
| Release-Signed|x64 = Release-Signed|x64 | ||
| Release-Signed|x86 = Release-Signed|x86 | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Debug|ARM.ActiveCfg = Debug|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release|ARM.ActiveCfg = Release|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release|x64.ActiveCfg = Release|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release|x86.ActiveCfg = Release|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release-Signed|Any CPU.ActiveCfg = Release-Signed|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release-Signed|Any CPU.Build.0 = Release-Signed|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release-Signed|ARM.ActiveCfg = Release-Signed|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release-Signed|ARM.Build.0 = Release-Signed|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release-Signed|x64.ActiveCfg = Release-Signed|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release-Signed|x64.Build.0 = Release-Signed|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release-Signed|x86.ActiveCfg = Release-Signed|Any CPU | ||
| {E6C50355-D01E-4CAA-884D-D7929861315C}.Release-Signed|x86.Build.0 = Release-Signed|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Debug|ARM.ActiveCfg = Debug|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release|ARM.ActiveCfg = Release|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release|x64.ActiveCfg = Release|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release|x86.ActiveCfg = Release|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release-Signed|Any CPU.ActiveCfg = Release-Signed|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release-Signed|Any CPU.Build.0 = Release-Signed|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release-Signed|ARM.ActiveCfg = Release-Signed|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release-Signed|ARM.Build.0 = Release-Signed|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release-Signed|x64.ActiveCfg = Release-Signed|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release-Signed|x64.Build.0 = Release-Signed|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release-Signed|x86.ActiveCfg = Release-Signed|Any CPU | ||
| {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release-Signed|x86.Build.0 = Release-Signed|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.