Skip to content

Commit e92afa1

Browse files
JinhuafeiJinhuafei
authored
Merge pull request #4 from aspnet/dev_vsupdate
Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.4
2 parents d63b1ce + 52251c3 commit e92afa1

8 files changed

Lines changed: 100 additions & 9 deletions

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.nuproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@
2020
<Destination>lib\net45</Destination>
2121
</NuGetContent>
2222
<NuGetContentProject Include="$(RepositoryRoot)\src\$(MSBuildProjectName)\$(MSBuildProjectName).csproj" Condition="'$(NuGetPackSymbols)' == 'true'" />
23-
<NuGetContent Include="Content\*">
24-
<Destination>content</Destination>
23+
<NuGetContent Include="Content\net45\*">
24+
<Destination>content\net45</Destination>
25+
</NuGetContent>
26+
<NuGetContent Include="Content\net46\*">
27+
<Destination>content\net46</Destination>
2528
</NuGetContent>
2629
<NuGetContent Include="build\*">
27-
<Destination>build</Destination>
30+
<Destination>build\net45</Destination>
2831
</NuGetContent>
2932
<NuGetContent Include="tools\*.ps1">
30-
<Destination>tools</Destination>
33+
<Destination>tools\net45</Destination>
3134
</NuGetContent>
3235
</ItemGroup>
3336
<Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.nuspec‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1616
<tags>Roslyn CodeDOM Compiler CSharp VB.Net ASP.NET</tags>
1717
<dependencies>
18-
<dependency id="Microsoft.Net.Compilers" version="$MSNetCompilersNuGetPackageVersion$" />
18+
<group targetFramework=".NETFramework4.5">
19+
<dependency id="Microsoft.Net.Compilers" version="$MSNetCompilersNuGetPackageVersion$" />
20+
</group>
21+
<group targetFramework=".NETFramework4.6">
22+
<dependency id="Microsoft.Net.Compilers" version="$MSNetCompilersNuGetPackageLatestVersion$" />
23+
</group>
1924
</dependencies>
2025
</metadata>
2126
</package>

src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/web.config.install.xdt renamed to src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/web.config.install.xdt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<compiler
2727
language="c#;cs;csharp"
2828
extension=".cs"
29-
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
29+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
3030
warningLevel="4"
3131
compilerOptions="/langversion:6 /nowarn:1659;1699;1701"
3232
xdt:Transform="Insert" />
@@ -49,7 +49,7 @@
4949
<compiler
5050
language="vb;vbs;visualbasic;vbscript"
5151
extension=".vb"
52-
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
52+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
5353
warningLevel="4"
5454
compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
5555
xdt:Transform="Insert" />

src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/web.config.uninstall.xdt renamed to src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/web.config.uninstall.xdt

File renamed without changes.

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/web.config.install.xdt‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<!-- If system.codedom tag is absent -->
4+
<system.codedom xdt:Transform="InsertIfMissing">
5+
</system.codedom>
6+
7+
<!-- If compilers tag is absent -->
8+
<system.codedom>
9+
<compilers xdt:Transform="InsertIfMissing">
10+
</compilers>
11+
</system.codedom>
12+
13+
<!-- If a .cs compiler is already present, the existing entry needs to be removed before inserting the new entry -->
14+
<system.codedom>
15+
<compilers>
16+
<compiler
17+
extension=".cs"
18+
xdt:Transform="Remove"
19+
xdt:Locator="Match(extension)" />
20+
</compilers>
21+
</system.codedom>
22+
23+
<!-- Inserting the new compiler -->
24+
<system.codedom>
25+
<compilers>
26+
<compiler
27+
language="c#;cs;csharp"
28+
extension=".cs"
29+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
30+
warningLevel="4"
31+
compilerOptions="/langversion:7 /nowarn:1659;1699;1701"
32+
xdt:Transform="Insert" />
33+
</compilers>
34+
</system.codedom>
35+
36+
<!-- If a .vb compiler is already present, the existing entry needs to be removed before inserting the new entry -->
37+
<system.codedom>
38+
<compilers>
39+
<compiler
40+
extension=".vb"
41+
xdt:Transform="Remove"
42+
xdt:Locator="Match(extension)" />
43+
</compilers>
44+
</system.codedom>
45+
46+
<!-- Inserting the new compiler -->
47+
<system.codedom>
48+
<compilers>
49+
<compiler
50+
language="vb;vbs;visualbasic;vbscript"
51+
extension=".vb"
52+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
53+
warningLevel="4"
54+
compilerOptions="/langversion:15 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
55+
xdt:Transform="Insert" />
56+
</compilers>
57+
</system.codedom>
58+
</configuration>

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/web.config.uninstall.xdt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<system.codedom>
4+
<compilers>
5+
<compiler
6+
extension=".cs"
7+
xdt:Transform="Remove"
8+
xdt:Locator="Match(extension)" />
9+
</compilers>
10+
</system.codedom>
11+
<system.codedom>
12+
<compilers>
13+
<compiler
14+
extension=".vb"
15+
xdt:Transform="Remove"
16+
xdt:Locator="Match(extension)" />
17+
</compilers>
18+
</system.codedom>
19+
<system.codedom>
20+
<compilers xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)" />
21+
</system.codedom>
22+
<system.codedom xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)" />
23+
</configuration>

‎tools/RoslynCodeProvider.settings.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
<VersionStartYear>2014</VersionStartYear>
77
<VersionMajor>1</VersionMajor>
88
<VersionMinor>0</VersionMinor>
9-
<VersionRelease>3</VersionRelease>
9+
<VersionRelease>4</VersionRelease>
1010
<VersionRelease Condition="'$(BuildQuality)' != 'rtm'">$(VersionRelease)-$(BuildQuality)</VersionRelease>
1111
</PropertyGroup>
1212

1313
<PropertyGroup Label="NuGet package dependencies">
1414
<MSNetCompilersNuGetPackageVersion>1.3.2</MSNetCompilersNuGetPackageVersion>
15+
<MSNetCompilersNuGetPackageLatestVersion>2.0.1</MSNetCompilersNuGetPackageLatestVersion>
1516
</PropertyGroup>
1617

1718
<!-- Default properties -->

‎tools/RoslynCodeProvider.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
<NuSpecProperties>
2323
NuGetPackageVersion=$(NuGetPackageVersion);
2424
NuGetPackageId=$(NuGetPackageId);
25-
MSNetCompilersNuGetPackageVersion=$(MSNetCompilersNuGetPackageVersion)
25+
MSNetCompilersNuGetPackageVersion=$(MSNetCompilersNuGetPackageVersion);
26+
MSNetCompilersNuGetPackageLatestVersion=$(MSNetCompilersNuGetPackageLatestVersion)
2627
</NuSpecProperties>
2728
</PropertyGroup>
2829
</Target>

0 commit comments

Comments
 (0)