Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/SunboX/Prism.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Siegel <me@dansiegel.net>2017-04-20 06:45:54 +0300
committerDan Siegel <me@dansiegel.net>2017-05-19 20:39:51 +0300
commita8d73d1780dcf454b5a515749821aef0524be573 (patch)
tree821375e0f8bc6220cda18e5bea405c34de102b4a
parentc4830502c8aa9b49e34749084e3423419385eb69 (diff)
Migrating Prism Core to NetStandard
-rw-r--r--Source/Prism.Tests/Mvvm/ViewModelLocationProviderFixture.cs2
-rw-r--r--Source/Prism.Tests/Properties/AssemblyInfo.cs36
-rw-r--r--Source/Prism.Tests/packages.config10
3 files changed, 1 insertions, 47 deletions
diff --git a/Source/Prism.Tests/Mvvm/ViewModelLocationProviderFixture.cs b/Source/Prism.Tests/Mvvm/ViewModelLocationProviderFixture.cs
index 8ecc7c0..2398480 100644
--- a/Source/Prism.Tests/Mvvm/ViewModelLocationProviderFixture.cs
+++ b/Source/Prism.Tests/Mvvm/ViewModelLocationProviderFixture.cs
@@ -163,7 +163,7 @@ namespace Prism.Tests.Mvvm
private static void ResetViewModelLocationProvider()
{
Type staticType = typeof(ViewModelLocationProvider);
- ConstructorInfo ci = staticType.TypeInitializer;
+ ConstructorInfo ci = staticType.GetTypeInfo().TypeInitializer;
object[] parameters = new object[0];
ci.Invoke(null, parameters);
}
diff --git a/Source/Prism.Tests/Properties/AssemblyInfo.cs b/Source/Prism.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 72d9914..0000000
--- a/Source/Prism.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Prism.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Prism.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a95cb7df-f667-44c7-9cac-750ba459a15d")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/Prism.Tests/packages.config b/Source/Prism.Tests/packages.config
deleted file mode 100644
index dcbf45e..0000000
--- a/Source/Prism.Tests/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="xunit" version="2.1.0" targetFramework="net45" />
- <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
- <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
- <package id="xunit.core" version="2.1.0" targetFramework="net45" />
- <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
- <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
- <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages> \ No newline at end of file