Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 24244214 编写于 作者: J Jared Parsons 提交者： GitHub
浏览文件
操作

Merge pull request #24672 from jaredpar/fix-msbuild 

Multitarget our msbuild task
上级 45a8675a ed6f5235
隐藏空白更改
内联 并排
Showing with 48 addition and 91 deletion
build.sh
浏览文件 @ 24244214
......@@ -127,7 +127,7 @@ then
dotnet publish "${root_path}"/src/Compilers/CSharp/csc -o "${bootstrap_path}/bincore" --framework ${bootstrap_framework} ${bootstrap_build_args} "/bl:${binaries_path}/BootstrapCsc.binlog"
dotnet publish "${root_path}"/src/Compilers/VisualBasic/vbc -o "${bootstrap_path}/bincore" --framework ${bootstrap_framework} ${bootstrap_build_args} "/bl:${binaries_path}/BootstrapVbc.binlog"
dotnet publish "${root_path}"/src/Compilers/Server/VBCSCompiler -o "${bootstrap_path}/bincore" --framework ${bootstrap_framework} ${bootstrap_build_args} "/bl:${binaries_path}/BootstrapVBCSCompiler.binlog"
dotnet publish "${root_path}"/src/Compilers/Core/MSBuildTask -o "${bootstrap_path}" ${bootstrap_build_args} "/bl:${binaries_path}/BoostrapMSBuildTask.binlog"
dotnet publish "${root_path}"/src/Compilers/Core/MSBuildTask -o "${bootstrap_path}" --framework ${bootstrap_framework} ${bootstrap_build_args} "/bl:${binaries_path}/BoostrapMSBuildTask.binlog"
fi
if [[ "${use_bootstrap}" == true ]]
......
build/config/SignToolData.json
浏览文件 @ 24244214
......@@ -60,8 +60,10 @@
"Dlls\\InteractiveEditorFeatures\\Microsoft.CodeAnalysis.InteractiveEditorFeatures.dll",
"Dlls\\InteractiveEditorFeatures\\*\\Microsoft.CodeAnalysis.InteractiveEditorFeatures.resources.dll",
"Dlls\\InteractiveFeatures\\Microsoft.CodeAnalysis.InteractiveFeatures.dll",
"Dlls\\MSBuildTask\\Microsoft.Build.Tasks.CodeAnalysis.dll",
"Dlls\\MSBuildTask\\*\\Microsoft.Build.Tasks.CodeAnalysis.resources.dll",
"Dlls\\MSBuildTask\\net46\\Microsoft.Build.Tasks.CodeAnalysis.dll",
"Dlls\\MSBuildTask\\net46\\*\\Microsoft.Build.Tasks.CodeAnalysis.resources.dll",
"Dlls\\MSBuildTask\\netcoreapp2.0\\Microsoft.Build.Tasks.CodeAnalysis.dll",
"Dlls\\MSBuildTask\\netcoreapp2.0\\*\\Microsoft.Build.Tasks.CodeAnalysis.resources.dll",
"Dlls\\RemoteWorkspaces\\Microsoft.CodeAnalysis.Remote.Workspaces.dll",
"Dlls\\Scripting\\Microsoft.CodeAnalysis.Scripting.dll",
"Dlls\\Scripting\\*\\Microsoft.CodeAnalysis.Scripting.resources.dll",
......
build/scripts/build.ps1
浏览文件 @ 24244214
......@@ -196,7 +196,7 @@ function Make-BootstrapBuild() {
Exec-Console "dotnet" "publish --no-restore src/Compilers/CSharp/csc -o `"$dir/bincore`" --framework $bootstrapFramework $bootstrapArgs -bl:$logDir/BootstrapCsc.binlog"
Exec-Console "dotnet" "publish --no-restore src/Compilers/VisualBasic/vbc -o `"$dir/bincore`" --framework $bootstrapFramework $bootstrapArgs -bl:$logDir/BootstrapVbc.binlog"
Exec-Console "dotnet" "publish --no-restore src/Compilers/Server/VBCSCompiler -o `"$dir/bincore`" --framework $bootstrapFramework $bootstrapArgs -bl:$logDir/BootstrapVBCSCompiler.binlog"
Exec-Console "dotnet" "publish --no-restore src/Compilers/Core/MSBuildTask -o `"$dir`" $bootstrapArgs -bl:$binariesDir/BootstrapMSBuildTask.binlog"
Exec-Console "dotnet" "publish --no-restore src/Compilers/Core/MSBuildTask -o `"$dir`" --framework $bootstrapFramework $bootstrapArgs -bl:$binariesDir/BootstrapMSBuildTask.binlog"
Stop-BuildProcesses
}
else {
......@@ -246,6 +246,7 @@ function Build-Artifacts() {
# finish building these before we can run signing.
function Build-ExtraSignArtifacts() {
Ensure-NuGet | Out-Null
Push-Location (Join-Path $repoDir "src\Setup")
try {
# Publish the CoreClr projects (CscCore and VbcCore) and dependencies for later NuGet packaging.
......@@ -256,10 +257,9 @@ function Build-ExtraSignArtifacts() {
Write-Host "Publishing VBCSCompiler"
Run-MSBuild "..\Compilers\Server\VBCSCompiler\VBCSCompiler.csproj" "/p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding"
Write-Host "Publishing MSBuildTask"
Run-MSBuild "..\Compilers\Core\MSBuildTask\MSBuildTask.csproj" "/p:TargetFramework=netstandard1.3 /t:PublishWithoutBuilding"
Run-MSBuild "..\Compilers\Core\MSBuildTask\MSBuildTask.csproj" "/p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding"
$dest = @(
$configDir)
$dest = @($configDir)
foreach ($dir in $dest) {
Copy-Item "PowerShell\*.ps1" $dir
}
......
src/Compilers/Core/MSBuildTask/CopyRefAssembly.cs
浏览文件 @ 24244214
......@@ -40,7 +40,7 @@ public override bool Execute()
if (File.Exists(DestinationPath))
{
Guid source;
var source = Guid.Empty;
try
{
source = ExtractMvid(SourcePath);
......
src/Compilers/Core/MSBuildTask/ErrorString.Designer.cs
浏览文件 @ 24244214
......@@ -10,7 +10,6 @@
namespace Microsoft.CodeAnalysis.BuildTasks {
using System;
using System.Reflection;
/// <summary>
......@@ -20,7 +19,7 @@ namespace Microsoft.CodeAnalysis.BuildTasks {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class ErrorString {
......@@ -40,7 +39,7 @@ internal class ErrorString {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CodeAnalysis.BuildTasks.ErrorString", typeof(ErrorString).GetTypeInfo().Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CodeAnalysis.BuildTasks.ErrorString", typeof(ErrorString).Assembly);
resourceMan = temp;
}
return resourceMan;
......
src/Compilers/Core/MSBuildTask/MSBuildTask.csproj
浏览文件 @ 24244214
......@@ -9,7 +9,8 @@
<RootNamespace>Microsoft.CodeAnalysis.BuildTasks</RootNamespace>
<AssemblyName>Microsoft.Build.Tasks.CodeAnalysis</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetFramework>netstandard1.3</TargetFramework>
<TargetFrameworks>$(RoslynPortableTargetFrameworks46)</TargetFrameworks>
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
......@@ -65,26 +66,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildFixedVersion)" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreFixedVersion)" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="$(MicrosoftWin32PrimitivesVersion)" />
<PackageReference Include="System.AppContext" Version="$(SystemAppContextVersion)" />
<PackageReference Include="System.Console" Version="$(SystemConsoleVersion)" />
<PackageReference Include="System.Collections.Concurrent" Version="$(SystemCollectionsConcurrentVersion)" />
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
<PackageReference Include="System.Diagnostics.Tools" Version="$(SystemDiagnosticsToolsVersion)" />
<PackageReference Include="System.IO.FileSystem" Version="$(SystemIOFileSystemVersion)" />
<PackageReference Include="System.IO.FileSystem.DriveInfo" Version="$(SystemIOFileSystemDriveInfoVersion)" />
<PackageReference Include="System.IO.Pipes" Version="$(SystemIOPipesVersion)" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" />
<PackageReference Include="System.Linq" Version="$(SystemLinqVersion)" />
<PackageReference Include="System.Reflection" Version="$(SystemReflectionVersion)" />
<PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="$(SystemSecurityCryptographyAlgorithmsVersion)" />
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
<PackageReference Include="System.Text.Encoding" Version="$(SystemTextEncodingVersion)" />
<PackageReference Include="System.Text.Encoding.Extensions" Version="$(SystemTextEncodingExtensionsVersion)" />
<PackageReference Include="System.Text.RegularExpressions" Version="$(SystemTextRegularExpressionsVersion)" />
<PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadVersion)" />
</ItemGroup>
<Import Project="..\CommandLine\CommandLine.projitems" Label="Shared" />
</Project>
\ No newline at end of file
src/Compilers/Extension/AssemblyRedirects.cs
浏览文件 @ 24244214
......@@ -9,10 +9,8 @@
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.AppContext.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Console.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Diagnostics.FileVersionInfo.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Diagnostics.Process.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.IO.Compression.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.IO.FileSystem.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.IO.FileSystem.DriveInfo.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.IO.FileSystem.Primitives.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.IO.Pipes.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.IO.Pipes.AccessControl.dll")]
......@@ -24,7 +22,6 @@
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Cryptography.X509Certificates.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Principal.Windows.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Text.Encoding.CodePages.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Threading.Thread.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Xml.XmlDocument.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Xml.XPath.dll")]
[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Xml.XPath.XDocument.dll")]
src/Compilers/Extension/CompilerExtension.csproj
浏览文件 @ 24244214
......@@ -48,13 +48,11 @@
<NuGetPackageToIncludeInVsix Include="System.Console" />
<NugetPackageToIncludeInVsix Include="System.Diagnostics.Contracts" />
<NuGetPackageToIncludeInVsix Include="System.Diagnostics.FileVersionInfo" />
<NuGetPackageToIncludeInVsix Include="System.Diagnostics.Process" />
<NuGetPackageToIncludeInVsix Include="System.Diagnostics.StackTrace" />
<NuGetPackageToIncludeInVsix Include="System.Diagnostics.Tools" />
<NuGetPackageToIncludeInVsix Include="System.IO" />
<NuGetPackageToIncludeInVsix Include="System.IO.Compression" />
<NuGetPackageToIncludeInVsix Include="System.IO.FileSystem" />
<NuGetPackageToIncludeInVsix Include="System.IO.FileSystem.DriveInfo" />
<NuGetPackageToIncludeInVsix Include="System.IO.FileSystem.Primitives" />
<NuGetPackageToIncludeInVsix Include="System.IO.Pipes" />
<NuGetPackageToIncludeInVsix Include="System.IO.Pipes.AccessControl" />
......@@ -75,7 +73,6 @@
<NuGetPackageToIncludeInVsix Include="System.Text.Encoding.Extensions" />
<NuGetPackageToIncludeInVsix Include="System.Text.RegularExpressions" />
<NuGetPackageToIncludeInVsix Include="System.Threading.Tasks.Parallel" />
<NuGetPackageToIncludeInVsix Include="System.Threading.Thread" />
<NuGetPackageToIncludeInVsix Include="System.ValueTuple" />
<NuGetPackageToIncludeInVsix Include="System.Xml.ReaderWriter" />
<NuGetPackageToIncludeInVsix Include="System.Xml.XDocument" />
......@@ -100,6 +97,7 @@
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX>
<AdditionalProperties>TargetFramework=net46</AdditionalProperties>
</ProjectReference>
<ProjectReference Include="..\Core\Portable\CodeAnalysis.csproj">
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
......
src/Compilers/Shared/BuildServerConnection.cs
浏览文件 @ 24244214
......@@ -472,7 +472,7 @@ private static bool CheckPipeConnectionOwnership(NamedPipeClientStream pipeStrea
}
}
#if NETSTANDARD1_3
#if NET46
internal static bool CheckIdentityUnix(PipeStream stream)
{
// Identity verification is unavailable in the MSBuild task,
......@@ -508,12 +508,6 @@ private static ObjectSecurity GetPipeSecurity(PipeStream pipeStream)
return pipeStream.GetAccessControl();
}
private static string GetUserName() =>
(string)typeof(Environment)
.GetTypeInfo()
.GetDeclaredProperty("UserName")
?.GetMethod?.Invoke(null, parameters: null);
/// <returns>
/// Null if not enough information was found to create a valid pipe name.
/// </returns>
......@@ -530,7 +524,7 @@ internal static string GetPipeNameForPathOpt(string compilerExeDirectory)
isAdmin = principal.IsInRole(WindowsBuiltInRole.Administrator);
}
var userName = GetUserName();
var userName = Environment.UserName;
if (userName == null)
{
return null;
......
src/NuGet/Microsoft.CodeAnalysis.Build.Tasks.nuspec
浏览文件 @ 24244214
......@@ -14,25 +14,20 @@
$commitPathMessage$
</description>
<dependencies>
<group targetFramework="netstandard1.3">
<group targetFramework="net46">
<dependency id="Microsoft.CodeAnalysis.CSharp" version="[$version$]" />
<dependency id="Microsoft.Build" version="$MicrosoftBuildFixedVersion$" />
<dependency id="Microsoft.Build.Tasks.Core" version="$MicrosoftBuildTasksCoreFixedVersion$" />
<dependency id="System.Security.AccessControl" version="$SystemSecurityAccessControlVersion$" />
<dependency id="System.IO.Pipes.AccessControl" version="$SystemIOPipesAccessControlVersion$" />
</group>
<dependency id="System.AppContext" version="$SystemAppContextVersion$" />
<dependency id="System.Console" version="$SystemConsoleVersion$" />
<dependency id="System.Diagnostics.Process" version="$SystemDiagnosticsProcessVersion$" />
<dependency id="System.Diagnostics.Tools" version="$SystemDiagnosticsToolsVersion$"/>
<dependency id="System.IO.FileSystem" version="$SystemIOFileSystemVersion$"/>
<dependency id="System.IO.FileSystem.DriveInfo" version="$SystemIOFileSystemDriveInfoVersion$"/>
<dependency id="System.IO.Pipes" version="$SystemIOPipesVersion$" />
<group targetFramework="netcoreapp2.0">
<dependency id="Microsoft.CodeAnalysis.CSharp" version="[$version$]" />
<dependency id="Microsoft.Build" version="$MicrosoftBuildFixedVersion$" />
<dependency id="Microsoft.Build.Tasks.Core" version="$MicrosoftBuildTasksCoreFixedVersion$" />
<dependency id="System.Security.AccessControl" version="$SystemSecurityAccessControlVersion$" />
<dependency id="System.Security.Cryptography.Algorithms" version="$SystemSecurityCryptographyAlgorithmsVersion$"/>
<dependency id="System.Security.Principal.Windows" version="$SystemSecurityPrincipalWindowsVersion$" />
<dependency id="System.Text.Encoding" version="$SystemTextEncodingVersion$"/>
<dependency id="System.Text.Encoding.Extensions" version="$SystemTextEncodingExtensionsVersion$"/>
<dependency id="System.Text.RegularExpressions" version="$SystemTextRegularExpressionsVersion$"/>
<dependency id="System.Threading.Thread" version="$SystemThreadingThreadVersion$" />
<dependency id="System.IO.Pipes.AccessControl" version="$SystemIOPipesAccessControlVersion$" />
</group>
</dependencies>
......@@ -52,10 +47,12 @@
</metadata>
<files>
<!-- Include PDB unless embedded into DLL -->
<file src="Dlls\MSBuildTask\Microsoft.Build.Tasks.CodeAnalysis.dll" target="lib\netstandard1.3" />
<file src="Dlls\MSBuildTask\Microsoft.Build.Tasks.CodeAnalysis.pdb*" target="lib\netstandard1.3" />
<file src="Dlls\MSBuildTask\Microsoft.CSharp.Core.targets" target="contentFiles\any\any" />
<file src="Dlls\MSBuildTask\Microsoft.VisualBasic.Core.targets" target="contentFiles\any\any" />
<file src="Dlls\MSBuildTask\netcoreapp2.0\Microsoft.Build.Tasks.CodeAnalysis.dll" target="lib\netcoreapp2.0" />
<file src="Dlls\MSBuildTask\netcoreapp2.0\Microsoft.Build.Tasks.CodeAnalysis.pdb*" target="lib\netcoreapp2.0" />
<file src="Dlls\MSBuildTask\net46\Microsoft.Build.Tasks.CodeAnalysis.dll" target="lib\net46" />
<file src="Dlls\MSBuildTask\net46\Microsoft.Build.Tasks.CodeAnalysis.pdb*" target="lib\net46" />
<file src="Dlls\MSBuildTask\net46\Microsoft.CSharp.Core.targets" target="contentFiles\any\any" />
<file src="Dlls\MSBuildTask\net46\Microsoft.VisualBasic.Core.targets" target="contentFiles\any\any" />
<file src="$thirdPartyNoticesPath$" target="" />
</files>
</package>
src/NuGet/Microsoft.NETCore.Compilers.nuspec
浏览文件 @ 24244214
......@@ -26,13 +26,12 @@
<file src="$additionalFilesPath$/Microsoft.NETCore.Compilers.props" target="build" />
<!-- Targets and task files -->
<file src="Dlls/MSBuildTask/netstandard1.3/publish/Microsoft.Build.Tasks.CodeAnalysis.dll" target="tools" />
<file src="Dlls/MSbuildTask/netstandard1.3/publish/Microsoft.CSharp.Core.targets" target="tools" />
<file src="Dlls/MSbuildTask/netstandard1.3/publish/Microsoft.VisualBasic.Core.targets" target="tools" />
<file src="Dlls/MSBuildTask/netcoreapp2.0/Microsoft.Build.Tasks.CodeAnalysis.dll" target="tools" />
<file src="Dlls/MSbuildTask/netcoreapp2.0/Microsoft.CSharp.Core.targets" target="tools" />
<file src="Dlls/MSbuildTask/netcoreapp2.0/Microsoft.VisualBasic.Core.targets" target="tools" />
<!-- N.B.: The backslashes below cannot be replaced with forward slashes.
https://github.com/NuGet/Home/issues/3584 -->
<file src="Dlls\MSBuildTask\netstandard1.3\publish\System.*.dll" target="tools" />
<file src="Dlls\MSBuildTask\netstandard1.3\publish\runtimes\**" target="tools\runtimes" />
<file src="Dlls\MSBuildTask\netcoreapp2.0\publish\runtimes\**" target="tools\runtimes" />
<!-- Compiler exe files -->
<file src="Dlls/CodeAnalysis/Microsoft.CodeAnalysis.dll" target="tools/bincore" />
......
src/NuGet/Microsoft.Net.Compilers.nuspec
浏览文件 @ 24244214
......@@ -49,9 +49,9 @@
<file src="Exes\vbc\net46\vbc.rsp" target="tools" />
<file src="Exes\VBCSCompiler\net46\VBCSCompiler.exe" target="tools" />
<file src="Exes\VBCSCompiler\net46\VBCSCompiler.exe.config" target="tools" />
<file src="Dlls\MSBuildTask\Microsoft.Build.Tasks.CodeAnalysis.dll" target="tools" />
<file src="Dlls\MSbuildTask\Microsoft.CSharp.Core.targets" target="tools" />
<file src="Dlls\MSbuildTask\Microsoft.VisualBasic.Core.targets" target="tools" />
<file src="Dlls\MSBuildTask\net46\Microsoft.Build.Tasks.CodeAnalysis.dll" target="tools" />
<file src="Dlls\MSbuildTask\net46\Microsoft.CSharp.Core.targets" target="tools" />
<file src="Dlls\MSbuildTask\net46\Microsoft.VisualBasic.Core.targets" target="tools" />
<!-- The assemblies are not signed by us and any deployed copy can be used.
The Exes\Toolset directory specifically has all of the assemblies we need.
......@@ -61,16 +61,13 @@
the src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb file, the
src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr file,
and src/Compilers/Extension/CompilerExtension.csproj file. -->
<file src="Exes\Toolset\Microsoft.Win32.Primitives.dll" target="tools" />
<file src="Exes\Toolset\System.AppContext.dll" target="tools" />
<file src="Exes\Toolset\System.Console.dll" target="tools" />
<file src="Exes\Toolset\System.Collections.Immutable.dll" target="tools" />
<file src="Exes\Toolset\System.Diagnostics.FileVersionInfo.dll" target="tools" />
<file src="Exes\Toolset\System.Diagnostics.Process.dll" target="tools" />
<file src="Exes\Toolset\System.Diagnostics.StackTrace.dll" target="tools" />
<file src="Exes\Toolset\System.IO.Compression.dll" target="tools" />
<file src="Exes\Toolset\System.IO.FileSystem.dll" target="tools" />
<file src="Exes\Toolset\System.IO.FileSystem.DriveInfo.dll" target="tools" />
<file src="Exes\Toolset\System.IO.FileSystem.Primitives.dll" target="tools" />
<file src="Exes\Toolset\System.IO.Pipes.dll" target="tools" />
<file src="Exes\Toolset\System.IO.Pipes.AccessControl.dll" target="tools" />
......@@ -83,7 +80,6 @@
<file src="Exes\Toolset\System.Security.Cryptography.X509Certificates.dll" target="tools" />
<file src="Exes\Toolset\System.Security.Principal.Windows.dll" target="tools" />
<file src="Exes\Toolset\System.Text.Encoding.CodePages.dll" target="tools" />
<file src="Exes\Toolset\System.Threading.Thread.dll" target="tools" />
<file src="Exes\Toolset\System.ValueTuple.dll" target="tools" />
<file src="Exes\Toolset\System.Xml.ReaderWriter.dll" target="tools" />
<file src="Exes\Toolset\System.Xml.XmlDocument.dll" target="tools" />
......
src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
浏览文件 @ 24244214
......@@ -769,13 +769,14 @@ Public Class BuildDevDivInsertionFiles
Dim values = CType(element.Property("values").Value, JArray)
For Each item As String In values
Dim parent = Path.GetDirectoryName(item)
Dim name = Path.GetFileName(item)
' Don't add in the csc.exe or vbc.exe from the CoreCLR projects.
If parent.EndsWith("Core", comparison) Then
If parent.EndsWith("NetFX20", comparison) Then
Continue For
End If
If parent.EndsWith("NetFX20", comparison) Then
' Don't add in the netcoreapp2.0 version of DLL
if Path.GetFileName(parent) = "netcoreapp2.0" AndAlso name = "Microsoft.Build.Tasks.CodeAnalysis.dll" Then
Continue For
End If
......@@ -821,8 +822,8 @@ Public Class BuildDevDivInsertionFiles
add("Dlls\CSharpResultProvider.Portable\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.vsdconfig")
add("Dlls\FunctionResolver\Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver.vsdconfig")
add("Dlls\ServicesVisualStudio\Microsoft.VisualStudio.LanguageServices.vsdconfig")
add("Dlls\MSBuildTask\Microsoft.CSharp.Core.targets")
add("Dlls\MSBuildTask\Microsoft.VisualBasic.Core.targets")
add("Dlls\MSBuildTask\net46\Microsoft.CSharp.Core.targets")
add("Dlls\MSBuildTask\net46\Microsoft.VisualBasic.Core.targets")
add("Dlls\CSharpCompilerTestUtilities\Roslyn.Compilers.CSharp.Test.Utilities.dll")
add("Dlls\BasicCompilerTestUtilities\Roslyn.Compilers.VisualBasic.Test.Utilities.dll")
add("Dlls\CompilerTestResources\\Roslyn.Compilers.Test.Resources.dll")
......@@ -845,11 +846,9 @@ Public Class BuildDevDivInsertionFiles
add("Exes\Toolset\System.Console.dll")
add("Exes\Toolset\System.Collections.Immutable.dll")
add("Exes\Toolset\System.Diagnostics.FileVersionInfo.dll")
add("Exes\Toolset\System.Diagnostics.Process.dll")
add("Exes\Toolset\System.Diagnostics.StackTrace.dll")
add("Exes\Toolset\System.IO.Compression.dll")
add("Exes\Toolset\System.IO.FileSystem.dll")
add("Exes\Toolset\System.IO.FileSystem.DriveInfo.dll")
add("Exes\Toolset\System.IO.FileSystem.Primitives.dll")
add("Exes\Toolset\System.IO.Pipes.dll")
add("Exes\Toolset\System.IO.Pipes.AccessControl.dll")
......@@ -862,13 +861,11 @@ Public Class BuildDevDivInsertionFiles
add("Exes\Toolset\System.Security.Cryptography.X509Certificates.dll")
add("Exes\Toolset\System.Security.Principal.Windows.dll")
add("Exes\Toolset\System.Text.Encoding.CodePages.dll")
add("Exes\Toolset\System.Threading.Thread.dll")
add("Exes\Toolset\System.ValueTuple.dll")
add("Exes\Toolset\System.Xml.ReaderWriter.dll")
add("Exes\Toolset\System.Xml.XmlDocument.dll")
add("Exes\Toolset\System.Xml.XPath.dll")
add("Exes\Toolset\System.Xml.XPath.XDocument.dll")
add("Exes\Toolset\Microsoft.Win32.Primitives.dll")
add("Vsix\VisualStudioSetup\Humanizer.dll")
Return map
End Function
......
src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr
浏览文件 @ 24244214
......@@ -21,13 +21,13 @@ folder InstallDir:\MSBuild\15.0\Bin\Roslyn
file source=$(OutputPath)\Exes\csi\net46\csi.rsp
file source=$(OutputPath)\Exes\vbc\net46\vbc.rsp
file source=$(OutputPath)\Dlls\MSBuildTask\Microsoft.VisualBasic.Core.targets
file source=$(OutputPath)\Dlls\MSBuildTask\Microsoft.CSharp.Core.targets
file source=$(OutputPath)\Dlls\MSBuildTask\net46\Microsoft.VisualBasic.Core.targets
file source=$(OutputPath)\Dlls\MSBuildTask\net46\Microsoft.CSharp.Core.targets
file source=$(OutputPath)\Dlls\Scripting\Microsoft.CodeAnalysis.Scripting.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Dlls\CSharpScripting\Microsoft.CodeAnalysis.CSharp.Scripting.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Dlls\CSharpCodeAnalysis\Microsoft.CodeAnalysis.CSharp.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Dlls\MSBuildTask\Microsoft.Build.Tasks.CodeAnalysis.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Dlls\MSBuildTask\net46\Microsoft.Build.Tasks.CodeAnalysis.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Dlls\BasicCodeAnalysis\Microsoft.CodeAnalysis.VisualBasic.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Dlls\CodeAnalysis\Microsoft.CodeAnalysis.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.Collections.Immutable.dll vs.file.ngenArchitecture=all
......@@ -37,11 +37,9 @@ folder InstallDir:\MSBuild\15.0\Bin\Roslyn
file source=$(OutputPath)\Vsix\CompilerExtension\System.AppContext.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.Console.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.Diagnostics.FileVersionInfo.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.Diagnostics.Process.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.Diagnostics.StackTrace.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.IO.Compression.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.IO.FileSystem.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.IO.FileSystem.DriveInfo.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.IO.FileSystem.Primitives.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.IO.Pipes.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.IO.Pipes.AccessControl.dll vs.file.ngenArchitecture=all
......@@ -53,13 +51,10 @@ folder InstallDir:\MSBuild\15.0\Bin\Roslyn
file source=$(OutputPath)\Vsix\CompilerExtension\System.Security.Cryptography.X509Certificates.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.Security.Principal.Windows.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.Text.Encoding.CodePages.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.Threading.Thread.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.Xml.ReaderWriter.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.Xml.XmlDocument.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.Xml.XPath.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\System.Xml.XPath.XDocument.dll vs.file.ngenArchitecture=all
file source=$(OutputPath)\Vsix\CompilerExtension\Microsoft.Win32.Primitives.dll vs.file.ngenArchitecture=all
folder InstallDir:\Common7\Tools\vsdevcmd\ext
file source=$(RepoRoot)\src\Setup\MSBuildScripts\roslyn.bat
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或