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

Commit a7ae749

Browse files
rynowakrynowak
committed
Update VS-only tooling to 4.7.2
1 parent 6c8e900 commit a7ae749

File tree

6 files changed

+24
-10
lines changed

6 files changed

+24
-10
lines changed

‎build/dependencies.props

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-alpha1-10717</MicrosoftExtensionsWebEncodersPackageVersion>
2222
<MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
2323
<MicrosoftNETCoreApp30PackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreApp30PackageVersion>
24+
<MicrosoftNETFrameworkReferenceAssemblies>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssemblies>
2425
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
2526
<MicrosoftVisualStudioComponentModelHostPackageVersion>15.8.525</MicrosoftVisualStudioComponentModelHostPackageVersion>
2627
<MicrosoftVisualStudioImageCatalogPackageVersion>15.8.28010</MicrosoftVisualStudioImageCatalogPackageVersion>

‎build/sources.props

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
1111
https://dotnet.myget.org/F/msbuild/api/v3/index.json;
1212
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
13+
https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
1314
https://vside.myget.org/F/vssdk/api/v3/index.json;
1415
https://vside.myget.org/F/vsmac/api/v3/index.json;
1516
https://vside.myget.org/F/devcore/api/v3/index.json;

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

+5-1
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</TargetFrameworks>
5+
<TargetFrameworks>net472</TargetFrameworks>
66
<EnableApiCheck>false</EnableApiCheck>
77
</PropertyGroup>
88

@@ -25,4 +25,8 @@
2525
<PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcPackageVersion)" />
2626
</ItemGroup>
2727

28+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
29+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" />
30+
</ItemGroup>
31+
2832
</Project>

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

+5-1
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 Razor design-time infrastructure for Visual Studio.</Description>
66
<EnableApiCheck>false</EnableApiCheck>
77
<RulesDirectory>..\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Rules\</RulesDirectory>
@@ -41,6 +41,10 @@
4141
<PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcPackageVersion)" />
4242
</ItemGroup>
4343

44+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
45+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" />
46+
</ItemGroup>
47+
4448
<ItemGroup>
4549
<ProjectReference Include="..\..\src\Microsoft.VisualStudio.Editor.Razor\Microsoft.VisualStudio.Editor.Razor.csproj" />
4650
</ItemGroup>

‎test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj

+5-1
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
<PreserveCompilationContext>true</PreserveCompilationContext>
66

77
<!-- The binding redirects are needed due to a conflict between the test host and Roslyn regarding System.Collections.Immutable -->
@@ -52,4 +52,8 @@
5252
<PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
5353
</ItemGroup>
5454

55+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
56+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" />
57+
</ItemGroup>
58+
5559
</Project>

‎tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<AppDesignerFolder>Properties</AppDesignerFolder>
4242
<RootNamespace>Microsoft.VisualStudio.RazorExtension</RootNamespace>
4343
<AssemblyName>Microsoft.VisualStudio.RazorExtension</AssemblyName>
44-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
44+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
4545
<GeneratePkgDefFile>true</GeneratePkgDefFile>
4646
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
4747
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -272,15 +272,15 @@
272272
</VSIXSourceItem>
273273
</ItemDefinitionGroup>
274274
<ItemGroup>
275-
<VSIXSourceItem Include="..\..\src\Microsoft.CodeAnalysis.Remote.Razor\bin\$(Configuration)\net46\Microsoft.CodeAnalysis.Remote.Razor.dll" />
275+
<VSIXSourceItem Include="..\..\src\Microsoft.CodeAnalysis.Remote.Razor\bin\$(Configuration)\net472\Microsoft.CodeAnalysis.Remote.Razor.dll" />
276276
<VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
277277
<VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" />
278278
<VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll" />
279-
<VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.AspNetCore.Razor.Language.dll" />
280-
<VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.CodeAnalysis.Razor.dll" />
281-
<VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
282-
<VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.VisualStudio.Editor.Razor.dll" />
283-
<VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.VisualStudio.LanguageServices.Razor.dll" />
279+
<VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.AspNetCore.Razor.Language.dll" />
280+
<VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.CodeAnalysis.Razor.dll" />
281+
<VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
282+
<VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.VisualStudio.Editor.Razor.dll" />
283+
<VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.VisualStudio.LanguageServices.Razor.dll" />
284284
<Content Include="@(VSIXSourceItem)">
285285
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
286286
</Content>

0 commit comments

Comments
 (0)