Skip to content

Commit 033e592

Browse files
authored
Merge pull request #14 from aspnet/dev_fixissue#13
Fix issue #13
2 parents abf5072 + 8412a32 commit 033e592

4 files changed

Lines changed: 9 additions & 14 deletions

File tree

src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,15 @@
44
<Link>roslyn\%(RecursiveDir)%(Filename)%(Extension)</Link>
55
</RoslyCompilerFiles>
66
</ItemGroup>
7-
<Target Name="RoslynCompilerFilesToPublish">
7+
<Target Name="IncludeRoslynCompilerFilesToFilesForPackagingFromProject" BeforeTargets="PrepareForRun" >
88
<ItemGroup>
9-
<_RoslynFiles Include="@(RoslyCompilerFiles)" />
10-
<FilesForPackagingFromProject Include="%(_RoslynFiles.Identity)">
9+
<FilesForPackagingFromProject Include="@(RoslyCompilerFiles)">
1110
<DestinationRelativePath>bin\roslyn\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
11+
<FromTarget>IncludeRoslynCompilerFilesToFilesForPackagingFromProject</FromTarget>
12+
<Category>Run</Category>
1213
</FilesForPackagingFromProject>
1314
</ItemGroup>
1415
</Target>
15-
<PropertyGroup>
16-
<CopyAllFilesToSingleFolderForPackageDependsOn>
17-
RoslynCompilerFilesToPublish;
18-
$(CopyAllFilesToSingleFolderForPackageDependsOn);
19-
</CopyAllFilesToSingleFolderForPackageDependsOn>
20-
</PropertyGroup>
2116
<Target Name="CopyRoslynCompilerFilesToOutputDirectory" AfterTargets="CopyFilesToOutputDirectory">
2217
<Copy SourceFiles="@(RoslyCompilerFiles)" DestinationFolder="$(WebProjectOutputDir)\bin\roslyn" ContinueOnError="true" SkipUnchangedFiles="true" Retries="0" />
2318
</Target>

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.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
29+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.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.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
52+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.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/net46/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.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
29+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
3030
warningLevel="4"
3131
compilerOptions="/langversion:default /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.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
52+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
5353
warningLevel="4"
5454
compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
5555
xdt:Transform="Insert" />

tools/RoslynCodeProvider.settings.targets

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

0 commit comments

Comments
 (0)