Renamed MVCFramework45 to just MVCFramework to avoid confusion. THis project is build for netcore and net46
This commit is contained in:
Cijo Thomas
Родитель
f51a2f5df3
Коммит
417797000d
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26730.3
|
||||
VisualStudioVersion = 15.0.26730.12
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF}"
|
||||
EndProject
|
||||
|
|
@ -36,12 +36,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApiShimFw46.FunctionalTe
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp.FunctionalTests", "test\EmptyApp.FunctionalTests\EmptyApp.FunctionalTests.csproj", "{71CE2DB2-C7AA-4454-B5F2-774BC575E321}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework45.FunctionalTests", "test\MVCFramework45.FunctionalTests\MVCFramework45.FunctionalTests.csproj", "{9F83564A-F84D-494A-9658-B080757EA82C}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp20.FunctionalTests", "test\EmptyApp20.FunctionalTests\EmptyApp20.FunctionalTests.csproj", "{C47AFD8A-3326-4391-8115-69349C04C3DA}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTestUtils20", "test\FunctionalTestUtils20\FunctionalTestUtils20.csproj", "{937AF006-898E-43FD-80A6-B20D7E3A1944}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework.FunctionalTests", "test\MVCFramework.FunctionalTests\MVCFramework.FunctionalTests.csproj", "{1D5825CC-2EC9-43A1-BE32-778EFF5EAC80}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
|
@ -68,10 +68,6 @@ Global
|
|||
{71CE2DB2-C7AA-4454-B5F2-774BC575E321}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{71CE2DB2-C7AA-4454-B5F2-774BC575E321}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{71CE2DB2-C7AA-4454-B5F2-774BC575E321}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9F83564A-F84D-494A-9658-B080757EA82C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9F83564A-F84D-494A-9658-B080757EA82C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9F83564A-F84D-494A-9658-B080757EA82C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9F83564A-F84D-494A-9658-B080757EA82C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{C47AFD8A-3326-4391-8115-69349C04C3DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{C47AFD8A-3326-4391-8115-69349C04C3DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{C47AFD8A-3326-4391-8115-69349C04C3DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
|
|
@ -80,6 +76,10 @@ Global
|
|||
{937AF006-898E-43FD-80A6-B20D7E3A1944}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{937AF006-898E-43FD-80A6-B20D7E3A1944}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{937AF006-898E-43FD-80A6-B20D7E3A1944}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{1D5825CC-2EC9-43A1-BE32-778EFF5EAC80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{1D5825CC-2EC9-43A1-BE32-778EFF5EAC80}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{1D5825CC-2EC9-43A1-BE32-778EFF5EAC80}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{1D5825CC-2EC9-43A1-BE32-778EFF5EAC80}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -91,9 +91,9 @@ Global
|
|||
{B7217A00-66FA-49A8-8EF3-39C07E1F7E33} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
|
||||
{11FB2EE6-7199-4AFF-BC73-25F35675F233} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
|
||||
{71CE2DB2-C7AA-4454-B5F2-774BC575E321} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
|
||||
{9F83564A-F84D-494A-9658-B080757EA82C} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
|
||||
{C47AFD8A-3326-4391-8115-69349C04C3DA} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
|
||||
{937AF006-898E-43FD-80A6-B20D7E3A1944} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
|
||||
{1D5825CC-2EC9-43A1-BE32-778EFF5EAC80} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {047855A4-470F-43B1-8B74-69651DD6B8A6}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
public class CorrelationMvcTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "MVCFramework45.FunctionalTests";
|
||||
private const string assemblyName = "MVCFramework.FunctionalTests";
|
||||
|
||||
[Fact]
|
||||
public void CorrelationInfoIsPropagatedToDependendedService()
|
||||
|
|
@ -17,7 +17,7 @@ namespace MVCFramework45.FunctionalTests.FunctionalTest
|
|||
|
||||
public class DependencyTelemetryMvcTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "MVCFramework45.FunctionalTests";
|
||||
private const string assemblyName = "MVCFramework.FunctionalTests";
|
||||
|
||||
[Fact]
|
||||
public void CorrelationInfoIsNotAddedToRequestHeaderIfUserAddDomainToExcludedList()
|
||||
|
|
@ -10,7 +10,7 @@ namespace MVCFramework45.FunctionalTests.FunctionalTest
|
|||
|
||||
public class ExceptionTelemetryMvcTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "MVCFramework45.FunctionalTests";
|
||||
private const string assemblyName = "MVCFramework.FunctionalTests";
|
||||
|
||||
[Fact]
|
||||
public void TestBasicRequestPropertiesAfterRequestingControllerThatThrows()
|
||||
|
|
@ -11,7 +11,7 @@ namespace MVCFramework45.FunctionalTests.FunctionalTest
|
|||
|
||||
public class RequestTelemetryMvcTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "MVCFramework45.FunctionalTests";
|
||||
private const string assemblyName = "MVCFramework.FunctionalTests";
|
||||
|
||||
[Fact]
|
||||
public void TestBasicRequestPropertiesAfterRequestingHomeController()
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
public class TelemetryModuleWorkingMvcTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "MVCFramework45.FunctionalTests";
|
||||
private const string assemblyName = "MVCFramework.FunctionalTests";
|
||||
|
||||
// The NET451 conditional check is wrapped inside the test to make the tests visible in the test explorer. We can move them to the class level once if the issue is resolved.
|
||||
|
||||
|
|
@ -6,11 +6,11 @@
|
|||
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net46' ">win7-x86</RuntimeIdentifier>
|
||||
<DelaySign>true</DelaySign>
|
||||
<PreserveCompilationContext>true</PreserveCompilationContext>
|
||||
<AssemblyName>MVCFramework45.FunctionalTests</AssemblyName>
|
||||
<AssemblyName>MVCFramework.FunctionalTests</AssemblyName>
|
||||
<AssemblyOriginatorKeyFile>../../keys/35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
|
||||
<PackageId>MVCFramework45.FunctionalTests</PackageId>
|
||||
<PackageId>MVCFramework.FunctionalTests</PackageId>
|
||||
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
||||
<UserSecretsId>aspnet-MVCFramework45.FunctionalTests-60cfc765-2dc9-454c-bb34-dc379ed92cd0</UserSecretsId>
|
||||
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.1.1</RuntimeFrameworkVersion>
|
||||
|
До Ширина: | Высота: | Размер: 31 KiB После Ширина: | Высота: | Размер: 31 KiB |
Загрузка…
Ссылка в новой задаче