Skip to content

Commit ccd373a

Browse files
HongGitHongGit
authored
Merge pull request #11 from aspnet/dev_fixpackageissue
Fixing issue#2 & issue#10
2 parents f753071 + bab3400 commit ccd373a

4 files changed

Lines changed: 65 additions & 11 deletions

File tree

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

Lines changed: 60 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,69 @@
44
<Link>roslyn\%(RecursiveDir)%(Filename)%(Extension)</Link>
55
</RoslyCompilerFiles>
66
</ItemGroup>
7-
<Target Name="IncludeRoslynCompilerFilesToItemGroup" AfterTargets="ResolveAssemblyReferences" >
7+
<Target Name="RoslynCompilerFilesToPublish">
88
<ItemGroup>
9-
<None Include="@(RoslyCompilerFiles)" Condition="">
10-
<Link>%(RoslyCompilerFiles.Link)</Link>
11-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
12-
</None>
9+
<_RoslynFiles Include="@(RoslyCompilerFiles)" />
10+
<FilesForPackagingFromProject Include="%(_RoslynFiles.Identity)">
11+
<DestinationRelativePath>bin\roslyn\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
12+
</FilesForPackagingFromProject>
1313
</ItemGroup>
1414
</Target>
15+
<PropertyGroup>
16+
<CopyAllFilesToSingleFolderForPackageDependsOn>
17+
RoslynCompilerFilesToPublish;
18+
$(CopyAllFilesToSingleFolderForPackageDependsOn);
19+
</CopyAllFilesToSingleFolderForPackageDependsOn>
20+
</PropertyGroup>
1521
<Target Name="CopyRoslynCompilerFilesToOutputDirectory" AfterTargets="CopyFilesToOutputDirectory">
16-
<Copy SourceFiles="@(RoslyCompilerFiles)" DestinationFolder="$(OutDir)roslyn" ContinueOnError="true" SkipUnchangedFiles="true" />
22+
<Copy SourceFiles="@(RoslyCompilerFiles)" DestinationFolder="$(WebProjectOutputDir)\bin\roslyn" ContinueOnError="true" SkipUnchangedFiles="true" Retries="0" />
1723
</Target>
24+
<Target Name = "KillVBCSCompilerAndRetryCopy" AfterTargets="CopyRoslynCompilerFilesToOutputDirectory" Condition="'$(MSBuildLastTaskResult)' == 'False'" >
25+
<KillProcess ProcessName="VBCSCompiler" ImagePath="$(WebProjectOutputDir)" />
26+
<Copy SourceFiles="@(RoslyCompilerFiles)" DestinationFolder="$(WebProjectOutputDir)\bin\roslyn" ContinueOnError="true" SkipUnchangedFiles="true" />
27+
</Target>
28+
<UsingTask TaskName="KillProcess" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
29+
<ParameterGroup>
30+
<ProcessName ParameterType="System.String" Required="true" />
31+
<ImagePath ParameterType="System.String" Required="true" />
32+
</ParameterGroup>
33+
<Task>
34+
<Reference Include="System" />
35+
<Reference Include="System.Management" />
36+
<Using Namespace="System" />
37+
<Using Namespace="System.Linq" />
38+
<Using Namespace="System.Diagnostics" />
39+
<Using Namespace="System.Management" />
40+
<Code Type="Fragment" Language="cs">
41+
<![CDATA[
42+
try
43+
{
44+
foreach(var p in Process.GetProcessesByName(ProcessName))
45+
{
46+
var wmiQuery = "SELECT ProcessId, ExecutablePath FROM Win32_Process WHERE ProcessId = " + p.Id;
47+
using(var searcher = new ManagementObjectSearcher(wmiQuery))
48+
{
49+
using(var results = searcher.Get())
50+
{
51+
var mo = results.Cast<ManagementObject>().FirstOrDefault();
52+
Log.LogMessage("ExecutablePath is {0}", (string)mo["ExecutablePath"]);
53+
if(mo != null && string.Compare((string)mo["ExecutablePath"], ImagePath, StringComparison.OrdinalIgnoreCase) > 0)
54+
{
55+
p.Kill();
56+
Log.LogMessage("{0} is killed", (string)mo["ExecutablePath"]);
57+
break;
58+
}
59+
}
60+
}
61+
}
62+
}
63+
catch (Exception ex)
64+
{
65+
Log.LogErrorFromException(ex);
66+
}
67+
return true;
68+
]]>
69+
</Code>
70+
</Task>
71+
</UsingTask>
1872
</Project>

‎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.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
29+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.6.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.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
52+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.6.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.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
29+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.6.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.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
52+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.6.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>5</VersionRelease>
9+
<VersionRelease>6</VersionRelease>
1010
<VersionRelease Condition="'$(BuildQuality)' != 'rtm'">$(VersionRelease)-$(BuildQuality)</VersionRelease>
1111
</PropertyGroup>
1212

0 commit comments

Comments
 (0)