Skip to content
This repository was archived by the owner on Dec 19, 2018. It is now read-only.

Commit 582f3f8

Browse files
rynowakrynowak
committed
Injest new Roslyn and do netstandard2.0/net472
1 parent 8d62937 commit 582f3f8

File tree

27 files changed

+70
-327
lines changed

27 files changed

+70
-327
lines changed

‎NuGetPackageVerifier.json

Lines changed: 7 additions & 199 deletions
Large diffs are not rendered by default.

‎build/MPack.targets

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<MPackArtifactCategory>shipoob</MPackArtifactCategory>
88

99
<MPackIntermediateOutputPath>$(IntermediateDir)mpack\</MPackIntermediateOutputPath>
10-
<AddinOutputPath>$(AddinDirectory)bin\$(Configuration)\net461\</AddinOutputPath>
10+
<AddinOutputPath>$(AddinDirectory)bin\$(Configuration)\net472\</AddinOutputPath>
1111
<LanguageServiceName>Microsoft.VisualStudio.Mac.LanguageServices.Razor</LanguageServiceName>
12-
<LanguageServiceOutputPath>$(RepositoryRoot)src\$(LanguageServiceName)\bin\$(Configuration)\net461\</LanguageServiceOutputPath>
12+
<LanguageServiceOutputPath>$(RepositoryRoot)src\$(LanguageServiceName)\bin\$(Configuration)\net472\</LanguageServiceOutputPath>
1313
<MPackName>$(AddinName)_$(AddinVersion)</MPackName>
1414
<MPackFileName>$(MPackName).mpack</MPackFileName>
1515
<MPackOutputPath>$(BuildDir)$(MPackFileName)</MPackOutputPath>
@@ -72,9 +72,9 @@
7272
</ItemGroup>
7373

7474
<ItemGroup>
75-
<LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" />
76-
<LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll" />
77-
<LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
75+
<LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" />
76+
<LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll" />
77+
<LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
7878
<LanguageServiceAssembly Include="$(LanguageServiceOutputPath)%(LanguageServiceAssemblyNames.Identity)" Condition="Exists('$(LanguageServiceOutputPath)%(LanguageServiceAssemblyNames.Identity)')" />
7979
<LanguageServiceAssembly Include="%(LanguageServiceExtensionAssembly.Identity)" />
8080
<LanguageServicePDB Include="%(LanguageServiceAssembly.RootDir)%(Directory)%(FileName).pdb" Condition="Exists('%(LanguageServiceAssembly.RootDir)%(Directory)%(FileName).pdb')" />

‎build/dependencies.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@
5151
<SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
5252
<SystemValueTuplePackageVersion>4.6.0-preview1-26829-04</SystemValueTuplePackageVersion>
5353
<VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
54-
<VSIX_MicrosoftCodeAnalysisCommonPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisCommonPackageVersion>
55-
<VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
56-
<VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>
57-
<VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
58-
<VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
59-
<VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>
60-
<VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
61-
<VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
62-
<VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>
63-
<VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>
54+
<VSIX_MicrosoftCodeAnalysisCommonPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisCommonPackageVersion>
55+
<VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
56+
<VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>
57+
<VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
58+
<VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
59+
<VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>
60+
<VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
61+
<VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
62+
<VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>
63+
<VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>
6464
<XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
6565
<XunitPackageVersion>2.3.1</XunitPackageVersion>
6666
<XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>

‎korebuild-lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version:3.0.0-alpha1-20181108.5
2-
commithash:dae1d0c39ad86505e53f3629665714313bfd0d7d
1+
version:3.0.0-build-20181120.4
2+
commithash:84dcc6f0eb5455a3c0305d6d238926defb050889

‎src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description>
5-
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
<PackageTags>$(PackageTags);aspnetcoremvc</PackageTags>
77
<EnableApiCheck>false</EnableApiCheck>
88
</PropertyGroup>

‎src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description>
5-
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
<PackageTags>$(PackageTags);aspnetcoremvc</PackageTags>
77
</PropertyGroup>
88

‎src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description>
5-
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
<PackageTags>$(PackageTags);aspnetcoremvc</PackageTags>
77
</PropertyGroup>
88

‎src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure.</Description>
5-
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎src/Microsoft.AspNetCore.Razor.Tools/Client.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using System.IO;
66
using System.IO.Pipes;
7-
#if NET46
7+
#if NETFRAMEWORK
88
using System.Security.AccessControl;
99
using System.Security.Principal;
1010
#endif
@@ -71,7 +71,7 @@ public static async Task<Client> ConnectAsync(string pipeName, TimeSpan? timeout
7171
ServerLogger.Log("Named pipe '{0}' connected", pipeName);
7272
cancellationToken.ThrowIfCancellationRequested();
7373

74-
#if NET46
74+
#if NETFRAMEWORK
7575
// Verify that we own the pipe.
7676
if (!CheckPipeConnectionOwnership(stream))
7777
{
@@ -89,7 +89,7 @@ public static async Task<Client> ConnectAsync(string pipeName, TimeSpan? timeout
8989
}
9090
}
9191

92-
#if NET46
92+
#if NETFRAMEWORK
9393
/// <summary>
9494
/// Check to ensure that the named pipe server we connected to is owned by the same
9595
/// user.

‎src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description>
5-
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
<EnableApiCheck>false</EnableApiCheck>
77
<DefineConstants>$(DefineConstants);DOCUMENT_SERVICE_FACTORY</DefineConstants>
88
</PropertyGroup>

‎src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description>
5-
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
@@ -13,9 +13,4 @@
1313
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonPackageVersion)" />
1414
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
1515
</ItemGroup>
16-
17-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
18-
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformationPackageVersion)" />
19-
</ItemGroup>
20-
2116
</Project>

‎src/Microsoft.NET.Sdk.Razor/DotnetToolTask.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ protected virtual bool TryExecuteOnServer(
124124
string commandLineCommands,
125125
out int result)
126126
{
127-
#if !NET46
127+
#if !NETFRAMEWORK
128128
if (!SuppressCurrentUserOnlyPipeOptions && !Enum.IsDefined(typeof(PipeOptions), PipeOptionCurrentUserOnly))
129129
{
130130
// For security reasons, we don't want to spin up a server that doesn't

‎src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -65,35 +65,7 @@
6565

6666
<!-- Binaries that should be signed by corefx/roslyn -->
6767
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\Microsoft.CodeAnalysis.dll" />
68-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\cs\Microsoft.CodeAnalysis.resources.dll" />
69-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\de\Microsoft.CodeAnalysis.resources.dll" />
70-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\es\Microsoft.CodeAnalysis.resources.dll" />
71-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\fr\Microsoft.CodeAnalysis.resources.dll" />
72-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\it\Microsoft.CodeAnalysis.resources.dll" />
73-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\ja\Microsoft.CodeAnalysis.resources.dll" />
74-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\ko\Microsoft.CodeAnalysis.resources.dll" />
75-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\pl\Microsoft.CodeAnalysis.resources.dll" />
76-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\pt-BR\Microsoft.CodeAnalysis.resources.dll" />
77-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\ru\Microsoft.CodeAnalysis.resources.dll" />
78-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\tr\Microsoft.CodeAnalysis.resources.dll" />
79-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\zh-Hans\Microsoft.CodeAnalysis.resources.dll" />
80-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\zh-Hant\Microsoft.CodeAnalysis.resources.dll" />
8168
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\Microsoft.CodeAnalysis.CSharp.dll" />
82-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\cs\Microsoft.CodeAnalysis.CSharp.resources.dll" />
83-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\de\Microsoft.CodeAnalysis.CSharp.resources.dll" />
84-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\es\Microsoft.CodeAnalysis.CSharp.resources.dll" />
85-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\fr\Microsoft.CodeAnalysis.CSharp.resources.dll" />
86-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\it\Microsoft.CodeAnalysis.CSharp.resources.dll" />
87-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\ja\Microsoft.CodeAnalysis.CSharp.resources.dll" />
88-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\ko\Microsoft.CodeAnalysis.CSharp.resources.dll" />
89-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\pl\Microsoft.CodeAnalysis.CSharp.resources.dll" />
90-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\pt-BR\Microsoft.CodeAnalysis.CSharp.resources.dll" />
91-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\ru\Microsoft.CodeAnalysis.CSharp.resources.dll" />
92-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\tr\Microsoft.CodeAnalysis.CSharp.resources.dll" />
93-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\zh-Hans\Microsoft.CodeAnalysis.CSharp.resources.dll" />
94-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\zh-Hant\Microsoft.CodeAnalysis.CSharp.resources.dll" />
95-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\System.Collections.Immutable.dll" />
96-
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\System.Reflection.Metadata.dll" />
9769
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\runtimes\unix\lib\netstandard1.3\System.Text.Encoding.CodePages.dll" />
9870
<ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\runtimes\win\lib\netstandard1.3\System.Text.Encoding.CodePages.dll" />
9971
</ItemGroup>

‎src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net46</TargetFrameworks>
4+
<TargetFrameworks>net472</TargetFrameworks>
55
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Visual Studio agnostic Razor design-time infrastructure.</Description>
66
<EnableApiCheck>false</EnableApiCheck>
77
</PropertyGroup>

‎src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net461</TargetFramework>
4+
<TargetFramework>net472</TargetFramework>
55
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure for Visual Studio for Mac.</Description>
66
<EnableApiCheck>false</EnableApiCheck>
77
</PropertyGroup>
@@ -15,4 +15,8 @@
1515
<ProjectReference Include="..\..\src\Microsoft.VisualStudio.Editor.Razor\Microsoft.VisualStudio.Editor.Razor.csproj" />
1616
</ItemGroup>
1717

18+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
19+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" />
20+
</ItemGroup>
21+
1822
</Project>

‎src/RazorPageGenerator/RazorPageGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Builds Razor pages for views in a project. For internal use only.</Description>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFramework>netcoreapp3.0</TargetFramework>
66
<AssemblyName>dotnet-razorpagegenerator</AssemblyName>
77
<PackageId>RazorPageGenerator</PackageId>
88
<OutputType>Exe</OutputType>

‎test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DeveloperBuildTestTfms)</TargetFrameworks>
5-
<TargetFrameworks Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net46</TargetFrameworks>
4+
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
65
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
76
<DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
87
</PropertyGroup>

‎test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@
77
using System.Linq;
88
using System.Reflection;
99
using System.Text.RegularExpressions;
10-
#if NET46
11-
using System.Runtime.Remoting;
12-
using System.Runtime.Remoting.Messaging;
13-
#else
1410
using System.Threading;
15-
#endif
1611
using Microsoft.AspNetCore.Razor.Language.Legacy;
1712
using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
1813
using Microsoft.AspNetCore.Razor.Language.Intermediate;
@@ -28,9 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
2823
[IntializeTestFile]
2924
public abstract class IntegrationTestBase
3025
{
31-
#if !NET46
3226
private static readonly AsyncLocal<string> _fileName = new AsyncLocal<string>();
33-
#endif
3427

3528
private static readonly CSharpCompilation DefaultBaseCompilation;
3629

@@ -114,22 +107,8 @@ protected IntegrationTestBase(bool? generateBaselines = null)
114107
// Used by the test framework to set the 'base' name for test files.
115108
public static string FileName
116109
{
117-
#if NETFRAMEWORK
118-
get
119-
{
120-
var handle = (ObjectHandle)CallContext.LogicalGetData("IntegrationTestBase_FileName");
121-
return (string)handle.Unwrap();
122-
}
123-
set
124-
{
125-
CallContext.LogicalSetData("IntegrationTestBase_FileName", new ObjectHandle(value));
126-
}
127-
#elif NETCOREAPP
128110
get { return _fileName.Value; }
129111
set { _fileName.Value = value; }
130-
#else
131-
#error Target frameworks need to be updated
132-
#endif
133112
}
134113

135114
public string FileExtension { get; set; } = ".cshtml";

‎test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@
88
using System.IO;
99
using System.Linq;
1010
using System.Reflection;
11-
#if NET46
12-
using System.Runtime.Remoting;
13-
using System.Runtime.Remoting.Messaging;
14-
#else
1511
using System.Threading;
16-
#endif
1712
using System.Text;
1813
using Xunit;
1914
using Xunit.Sdk;
@@ -24,10 +19,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
2419
[IntializeTestFile]
2520
public abstract class ParserTestBase
2621
{
27-
#if !NET46
2822
private static readonly AsyncLocal<string> _fileName = new AsyncLocal<string>();
2923
private static readonly AsyncLocal<bool> _isTheory = new AsyncLocal<bool>();
30-
#endif
3124

3225
internal ParserTestBase()
3326
{
@@ -51,40 +44,14 @@ internal ParserTestBase()
5144
// Used by the test framework to set the 'base' name for test files.
5245
public static string FileName
5346
{
54-
#if NETFRAMEWORK
55-
get
56-
{
57-
var handle = (ObjectHandle)CallContext.LogicalGetData("ParserTestBase_FileName");
58-
return (string)handle.Unwrap();
59-
}
60-
set
61-
{
62-
CallContext.LogicalSetData("ParserTestBase_FileName", new ObjectHandle(value));
63-
}
64-
#elif NETCOREAPP
6547
get { return _fileName.Value; }
6648
set { _fileName.Value = value; }
67-
#else
68-
#error Target frameworks need to be updated.
69-
#endif
7049
}
7150

7251
public static bool IsTheory
7352
{
74-
#if NETFRAMEWORK
75-
get
76-
{
77-
var handle = (ObjectHandle)CallContext.LogicalGetData("ParserTestBase_IsTheory");
78-
return (bool)handle.Unwrap();
79-
}
80-
set
81-
{
82-
CallContext.LogicalSetData("ParserTestBase_IsTheory", new ObjectHandle(value));
83-
}
84-
#elif NETCOREAPP
8553
get { return _isTheory.Value; }
8654
set { _isTheory.Value = value; }
87-
#endif
8855
}
8956

9057
protected int BaselineTestCount { get; set; }

0 commit comments

Comments
 (0)