Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

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

提交 62b1ad0b 编写于 作者: A Andy Gocke 提交者： Jared Parsons
浏览文件
操作

Implement cross-platform support

上级 107f19ba
显示空白变更内容
内联 并排
Showing with 123 addition and 244 deletion
BuildAndTest.proj
浏览文件 @ 62b1ad0b
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<RunTestArgs>$(RunTestArgs) -nocache</RunTestArgs> <RunTestArgs>$(RunTestArgs) -nocache</RunTestArgs>
<IncludePattern Condition="'$(IncludePattern)' == '' AND '$(TestVsi)' != 'true'">*.UnitTests.dll</IncludePattern> <IncludePattern Condition="'$(IncludePattern)' == '' AND '$(TestVsi)' != 'true'">*.UnitTests.dll</IncludePattern>
<IncludePattern Condition="'$(IncludePattern)' == '' AND '$(TestVsi)' == 'true'">*.IntegrationTests.dll</IncludePattern> <IncludePattern Condition="'$(IncludePattern)' == '' AND '$(TestVsi)' == 'true'">*.IntegrationTests.dll</IncludePattern>
<OutputDirectory>Binaries\$(Configuration)</OutputDirectory> <OutputDirectory>$(MSBuildThisFileDirectory)Binaries\$(Configuration)\</OutputDirectory>
<RunTestArgs>$(RunTestArgs) -log:&quot;$(OutputDirectory)\runtests.log&quot;</RunTestArgs> <RunTestArgs>$(RunTestArgs) -log:&quot;$(OutputDirectory)\runtests.log&quot;</RunTestArgs>
<CoreClrTestDirectory>$(OutputDirectory)\CoreClrTest</CoreClrTestDirectory> <CoreClrTestDirectory>$(OutputDirectory)\CoreClrTest</CoreClrTestDirectory>
<MSBuildCommonProperties> <MSBuildCommonProperties>
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
TreatWarningsAsErrors=true; TreatWarningsAsErrors=true;
DeployExtension=false; DeployExtension=false;
</MSBuildCommonProperties> </MSBuildCommonProperties>
<TestDesktop Condition="'$(TestDesktop)' == ''">true</TestDesktop>
<TestCoreClr Condition="'$(TestCoreClr)' == ''">true</TestCoreClr>
</PropertyGroup> </PropertyGroup>
<Target Name="Build"> <Target Name="Build">
...@@ -79,28 +81,41 @@ ...@@ -79,28 +81,41 @@
SkipUnchangedFiles="true" SkipUnchangedFiles="true"
UseHardlinksIfPossible="true" /> UseHardlinksIfPossible="true" />
<MakeDir Directories="$(CoreClrTestDirectory)\xUnitResults" /> <MakeDir Directories="$(CoreClrTestDirectory)/xUnitResults" />
<!-- Publish binaries for CoreClr test -->
<MSBuild BuildInParallel="true"
Projects="src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj"
Properties="RuntimeIdentifier=win7-x64;PublishDir=$(CoreClrTestDirectory)"
Targets="Publish" />
<ItemGroup> <ItemGroup>
<!-- MakeConst unit tests tracked by https://github.com/dotnet/roslyn/issues/5918 --> <!-- MakeConst unit tests tracked by https://github.com/dotnet/roslyn/issues/5918 -->
<TestAssemblies Condition="'$(Test64)' != 'true'" <TestAssemblies Condition="'$(Test64)' != 'true'"
Include="$(OutputDirectory)\UnitTests*\**\$(IncludePattern);" /> Include="$(OutputDirectory)UnitTests*\**\$(IncludePattern);" />
<TestAssemblies Condition="'$(Test64)' == 'true'" <TestAssemblies Condition="'$(Test64)' == 'true'"
Include="$(OutputDirectory)\UnitTests*\**\$(IncludePattern);" Include="$(OutputDirectory)UnitTests*\**\$(IncludePattern);"
Exclude="$(OutputDirectory)\UnitTests*\**\Roslyn.Interactive*" /> Exclude="$(OutputDirectory)UnitTests*\**\Roslyn.Interactive*" />
<CoreTestAssemblies Include="$(CoreClrTestDirectory)\$(IncludePattern)" /> <CoreTestAssemblies Include="$(CoreClrTestDirectory)\$(IncludePattern)" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<CoreRunExe>$(CoreClrTestDirectory)\CoreRun.exe</CoreRunExe> <CoreRunExe>$(CoreClrTestDirectory)/CoreRun.exe</CoreRunExe>
<CoreRunArgs>$(CoreClrTestDirectory)\xunit.console.netcore.exe @(CoreTestAssemblies, ' ') -parallel all -xml $(CoreClrTestDirectory)\xUnitResults\TestResults.xml</CoreRunArgs> <CoreRunArgs>$(CoreClrTestDirectory)/xunit.console.netcore.exe @(CoreTestAssemblies, ' ') -parallel all -xml $(CoreClrTestDirectory)/xUnitResults/TestResults.xml</CoreRunArgs>
<RunTestsExe>Binaries\$(Configuration)\Exes\RunTests\RunTests.exe</RunTestsExe> <RunTestsExe>Binaries/$(Configuration)/Exes/RunTests/RunTests.exe</RunTestsExe>
<RunTestsArgs>$(NuGetPackageRoot)\xunit.runner.console\$(xunitrunnerconsoleVersion)\tools $(RunTestArgs) @(TestAssemblies, ' ')</RunTestsArgs> <RunTestsArgs>$(NuGetPackageRoot)/xunit.runner.console/$(xunitrunnerconsoleVersion)/tools $(RunTestArgs) @(TestAssemblies, ' ')</RunTestsArgs>
<VsixExpInstallerExe>$(NuGetPackageRoot)/roslyntools.microsoft.vsixexpinstaller/$(RoslynToolsMicrosoftVSIXExpInstallerVersion)/tools/VsixExpInstaller.exe</VsixExpInstallerExe>
<VsixExpInstallerArgs>-rootSuffix:RoslynDev -vsInstallDir:"$([System.IO.Path]::GetFullPath('$(MSBuildBinPath)/../../..'))"</VsixExpInstallerArgs>
</PropertyGroup> </PropertyGroup>
<!-- Publish binaries for CoreClr test -->
<MSBuild Projects="src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj"
Properties="RuntimeIdentifier=win7-x64"
Targets="Publish" />
<!-- Run CoreClr tests --> <!-- Run CoreClr tests -->
<Exec Condition="'$(TestCoreClr)' == 'true'" Command="&quot;$(CoreRunExe)&quot; $(CoreRunArgs)" /> <Exec Condition="'$(TestCoreClr)' == 'true'" Command="&quot;$(CoreRunExe)&quot; $(CoreRunArgs)" />
......
Makefile
浏览文件 @ 62b1ad0b
...@@ -2,24 +2,20 @@ SHELL = /usr/bin/env bash ...@@ -2,24 +2,20 @@ SHELL = /usr/bin/env bash
OS_NAME = $(shell uname -s) OS_NAME = $(shell uname -s)
BUILD_CONFIGURATION = Debug BUILD_CONFIGURATION = Debug
BINARIES_PATH = $(shell pwd)/Binaries BINARIES_PATH = $(shell pwd)/Binaries
SCRIPTS_PATH = $(shell pwd)/build/scripts
SRC_PATH = $(shell pwd)/src SRC_PATH = $(shell pwd)/src
TOOLSET_SRC_PATH = $(shell pwd)/build/MSBuildToolset
TOOLSET_PATH = $(BINARIES_PATH)/toolset
RESTORE_SEMAPHORE_PATH = $(BINARIES_PATH)/restore.semaphore
BOOTSTRAP_PATH = $(BINARIES_PATH)/Bootstrap BOOTSTRAP_PATH = $(BINARIES_PATH)/Bootstrap
BUILD_LOG_PATH = BUILD_LOG_PATH =
HOME_DIR = $(shell cd ~ && pwd) HOME_DIR = $(shell cd ~ && pwd)
DOTNET_VERSION = 1.0.0-preview3-003223 DOTNET_VERSION = 1.0.1
NUGET_VERSION = 3.5.0-beta2 DOTNET = $(BINARIES_PATH)/dotnet-cli/dotnet
NUGET_EXE = $(shell pwd)/nuget.exe TARGET_FX = netcoreapp1.1
MSBUILD_ADDITIONALARGS := /v:m /fl /fileloggerparameters:Verbosity=normal /p:Configuration=$(BUILD_CONFIGURATION) MSBUILD_ADDITIONALARGS := /v:m /fl /fileloggerparameters:Verbosity=normal /p:Configuration=$(BUILD_CONFIGURATION)
ifeq ($(OS_NAME),Linux) ifeq ($(OS_NAME),Linux)
MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:BaseNuGetRuntimeIdentifier=$(shell . /etc/os-release && echo $$ID.$$VERSION_ID) RUNTIME_ID := $(shell . /etc/os-release && echo $$ID.$$VERSION_ID)-x64
else ifeq ($(OS_NAME),Darwin) else ifeq ($(OS_NAME),Darwin)
MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:BaseNuGetRuntimeIdentifier=osx.10.12 RUNTIME_ID := osx.10.12-x64
endif endif
ifneq ($(BUILD_LOG_PATH),) ifneq ($(BUILD_LOG_PATH),)
...@@ -27,66 +23,45 @@ ifneq ($(BUILD_LOG_PATH),) ...@@ -27,66 +23,45 @@ ifneq ($(BUILD_LOG_PATH),)
endif endif
ifeq ($(BOOTSTRAP),true) ifeq ($(BOOTSTRAP),true)
MSBUILD_ARGS = $(MSBUILD_ADDITIONALARGS) /p:CscToolPath=$(BOOTSTRAP_PATH) /p:CscToolExe=csc /p:VbcToolPath=$(BOOTSTRAP_PATH) /p:VbcToolExe=vbc MSBUILD_ARGS = $(MSBUILD_ADDITIONALARGS) /p:CscToolPath=$(BOOTSTRAP_PATH)/csc /p:CscToolExe=csc /p:VbcToolPath=$(BOOTSTRAP_PATH)/vbc /p:VbcToolExe=vbc
else else
MSBUILD_ARGS = $(MSBUILD_ADDITIONALARGS) /p:CscToolExe=csc /p:VbcToolExe=vbc MSBUILD_ARGS = $(MSBUILD_ADDITIONALARGS)
endif endif
MSBUILD_CMD = $(TOOLSET_PATH)/corerun $(TOOLSET_PATH)/MSBuild.dll $(MSBUILD_ARGS) BUILD_CMD = dotnet build $(MSBUILD_ARGS)
.PHONY: all bootstrap test restore toolset nuget .PHONY: all bootstrap test toolset
all: $(RESTORE_SEMAPHORE_PATH) all: restore
export HOME=$(HOME_DIR) ; \ @export PATH="$(BINARIES_PATH)/dotnet-cli:$(PATH)" ; \
$(MSBUILD_CMD) CrossPlatform.sln $(BUILD_CMD) CrossPlatform.sln
bootstrap: $(TOOLSET_PATH) $(RESTORE_SEMAPHORE_PATH) bootstrap: restore
export HOME=$(HOME_DIR) ; \ export PATH="$(BINARIES_PATH)/dotnet-cli:$(PATH)" ; \
$(MSBUILD_CMD) src/Compilers/CSharp/CscCore/CscCore.csproj && \ $(BUILD_CMD) src/Compilers/CSharp/CscCore && \
$(MSBUILD_CMD) src/Compilers/VisualBasic/VbcCore/VbcCore.csproj && \ $(BUILD_CMD) src/Compilers/VisualBasic/VbcCore && \
mkdir -p $(BOOTSTRAP_PATH) && \ mkdir -p $(BOOTSTRAP_PATH)/csc && mkdir -p $(BOOTSTRAP_PATH)/vbc && \
cp -f Binaries/$(BUILD_CONFIGURATION)/Exes/CscCore/* $(BOOTSTRAP_PATH) && \ dotnet publish -r $(RUNTIME_ID) src/Compilers/CSharp/CscCore -o $(BOOTSTRAP_PATH)/csc && \
cp -f Binaries/$(BUILD_CONFIGURATION)/Exes/VbcCore/* $(BOOTSTRAP_PATH) dotnet publish -r $(RUNTIME_ID) src/Compilers/VisualBasic/VbcCore -o $(BOOTSTRAP_PATH)/vbc
ifneq ($(SKIP_CROSSGEN),true)
build/scripts/crossgen.sh $(BOOTSTRAP_PATH)
endif
rm -rf Binaries/$(BUILD_CONFIGURATION) rm -rf Binaries/$(BUILD_CONFIGURATION)
test: test:
@export PATH="$(BINARIES_PATH)/dotnet-cli:$(PATH)" ; \
dotnet publish -r $(RUNTIME_ID) src/Test/DeployCoreClrTestRuntime -o $(BINARIES_PATH)/$(BUILD_CONFIGURATION)/CoreClrTest && \
build/scripts/tests.sh $(BUILD_CONFIGURATION) build/scripts/tests.sh $(BUILD_CONFIGURATION)
restore: $(NUGET_EXE) $(RESTORE_SEMAPHORE_PATH) restore: $(DOTNET)
export PATH="$(BINARIES_PATH)/dotnet-cli:$(PATH)" ; \
$(RESTORE_SEMAPHORE_PATH): $(TOOLSET_PATH) dotnet restore CrossPlatform.sln
@build/scripts/restore.sh $(TOOLSET_PATH) $(NUGET_EXE) && \
touch $(RESTORE_SEMAPHORE_PATH)
$(NUGET_EXE): $(DOTNET):
curl https://dist.nuget.org/win-x86-commandline/v$(NUGET_VERSION)/NuGet.exe -o $(NUGET_EXE) --create-dirs mkdir -p $(BINARIES_PATH) ; \
pushd $(BINARIES_PATH) ; \
curl -O https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh && \
chmod +x dotnet-install.sh && \
./dotnet-install.sh --version "$(DOTNET_VERSION)" --install-dir "$(BINARIES_PATH)/dotnet-cli"
nuget: $(NUGET_EXE)
clean: clean:
@rm -rf Binaries @rm -rf Binaries
clean_toolset:
@rm -rf $(TOOLSET_PATH)
toolset: $(TOOLSET_PATH)
$(TOOLSET_PATH): $(BINARIES_PATH)/dotnet-cli
export HOME=$(HOME_DIR) ; \
pushd $(TOOLSET_SRC_PATH) ; \
$(BINARIES_PATH)/dotnet-cli/dotnet restore && \
$(BINARIES_PATH)/dotnet-cli/dotnet publish -o $(TOOLSET_PATH) && \
sed -i -e 's/Microsoft.CSharp.Targets/Microsoft.CSharp.targets/g' $(TOOLSET_PATH)/Microsoft/Portable/v5.0/Microsoft.Portable.CSharp.targets
# https://github.com/dotnet/roslyn/issues/9641
$(BINARIES_PATH)/dotnet-cli:
@mkdir -p $(BINARIES_PATH) ; \
pushd $(BINARIES_PATH) ; \
curl -O https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh ; \
chmod +x dotnet-install.sh ; \
./dotnet-install.sh --version "$(DOTNET_VERSION)" --install-dir "$(BINARIES_PATH)/dotnet-cli"
build/Targets/GenerateAssemblyInfo.targets
浏览文件 @ 62b1ad0b
...@@ -74,12 +74,11 @@ ...@@ -74,12 +74,11 @@
<Output TaskParameter="Include" ItemName="AssemblyVersionAttribute" /> <Output TaskParameter="Include" ItemName="AssemblyVersionAttribute" />
</CreateItem> </CreateItem>
<!-- The necessity of this Task is tracked by https://github.com/dotnet/roslyn/issues/8421 --> <WriteCodeFragment AssemblyAttributes="@(AssemblyVersionAttribute)"
<WriteCodeFragmentEx AssemblyAttributes="@(AssemblyVersionAttribute)"
Language="$(Language)" Language="$(Language)"
OutputFile="$(GeneratedAssemblyInfoFile)"> OutputFile="$(GeneratedAssemblyInfoFile)">
<Output TaskParameter="OutputFile" ItemName="Compile" /> <Output TaskParameter="OutputFile" ItemName="Compile" />
<Output TaskParameter="OutputFile" ItemName="FileWrites" /> <Output TaskParameter="OutputFile" ItemName="FileWrites" />
</WriteCodeFragmentEx> </WriteCodeFragment>
</Target> </Target>
</Project> </Project>
build/Targets/GenerateInternalsVisibleTo.targets
浏览文件 @ 62b1ad0b
...@@ -107,13 +107,13 @@ ...@@ -107,13 +107,13 @@
Condition="'@(InternalsVisibleToRazor)' != ''"> Condition="'@(InternalsVisibleToRazor)' != ''">
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" /> <Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
</CreateItem> </CreateItem>
<!-- The necessity of this Task is tracked by https://github.com/dotnet/roslyn/issues/8421 -->
<WriteCodeFragmentEx AssemblyAttributes="@(InternalsVisibleToAttribute)" <WriteCodeFragment AssemblyAttributes="@(InternalsVisibleToAttribute)"
Language="$(Language)" Language="$(Language)"
OutputFile="$(GeneratedInternalsVisibleToFile)"> OutputFile="$(GeneratedInternalsVisibleToFile)">
<Output TaskParameter="OutputFile" ItemName="Compile" /> <Output TaskParameter="OutputFile" ItemName="Compile" />
<Output TaskParameter="OutputFile" ItemName="FileWrites" /> <Output TaskParameter="OutputFile" ItemName="FileWrites" />
</WriteCodeFragmentEx> </WriteCodeFragment>
</Target> </Target>
</Project> </Project>
build/Targets/Imports.targets
浏览文件 @ 62b1ad0b
...@@ -237,9 +237,6 @@ ...@@ -237,9 +237,6 @@
<Import Project="$(MSBuildTargetsFilePath)" Condition="'$(RoslynSdkProject)' != 'true'" /> <Import Project="$(MSBuildTargetsFilePath)" Condition="'$(RoslynSdkProject)' != 'true'" />
<Import Project="$(RoslynNetSdkRootPath)Sdk.targets" Condition="'$(RoslynSdkProject)' == 'true'" /> <Import Project="$(RoslynNetSdkRootPath)Sdk.targets" Condition="'$(RoslynSdkProject)' == 'true'" />
<!-- On *nix the NuGet targets aren't imported by default, so we do that here -->
<Import Project="$(MSBuildBinPath)\Microsoft.NuGet.targets" Condition="'$(OS)' != 'Windows_NT'" />
<!-- The portable v5.0 framework is delivered over NuGet, so std resolution should be disabled --> <!-- The portable v5.0 framework is delivered over NuGet, so std resolution should be disabled -->
<Import Project="DisableStandardFrameworkResolution.targets" <Import Project="DisableStandardFrameworkResolution.targets"
Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable' AND '$(TargetFrameworkVersion)' == 'v5.0'" /> Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable' AND '$(TargetFrameworkVersion)' == 'v5.0'" />
......
build/Targets/Packages.props
浏览文件 @ 62b1ad0b
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<MicrosoftNetCompilersnetcoreVersion>2.0.0-rc2-61102-09</MicrosoftNetCompilersnetcoreVersion> <MicrosoftNetCompilersnetcoreVersion>2.0.0-rc2-61102-09</MicrosoftNetCompilersnetcoreVersion>
<MicrosoftNetRoslynDiagnosticsVersion>2.0.0-beta1-61628-06</MicrosoftNetRoslynDiagnosticsVersion> <MicrosoftNetRoslynDiagnosticsVersion>2.0.0-beta1-61628-06</MicrosoftNetRoslynDiagnosticsVersion>
<MicrosoftNetCoreILAsmVersion>1.1.0</MicrosoftNetCoreILAsmVersion> <MicrosoftNetCoreILAsmVersion>1.1.0</MicrosoftNetCoreILAsmVersion>
<MicrosoftNETCoreCompilersVersion>2.3.0-dev-56735-00</MicrosoftNETCoreCompilersVersion>
<MicrosoftNETCoreVersion>5.0.0</MicrosoftNETCoreVersion> <MicrosoftNETCoreVersion>5.0.0</MicrosoftNETCoreVersion>
<MicrosoftNETCoreAppVersion>1.1.0</MicrosoftNETCoreAppVersion> <MicrosoftNETCoreAppVersion>1.1.0</MicrosoftNETCoreAppVersion>
<MicrosoftNETCorePlatformsVersion>1.1.0</MicrosoftNETCorePlatformsVersion> <MicrosoftNETCorePlatformsVersion>1.1.0</MicrosoftNETCorePlatformsVersion>
......
build/Targets/Settings.props
浏览文件 @ 62b1ad0b
...@@ -12,9 +12,6 @@ ...@@ -12,9 +12,6 @@
<RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\'))</RepoRoot> <RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\'))</RepoRoot>
<NuGetToolPath>$(RepoRoot)nuget.exe</NuGetToolPath> <NuGetToolPath>$(RepoRoot)nuget.exe</NuGetToolPath>
<ToolsetPackagesDir>$(RepoRoot)build\ToolsetPackages\</ToolsetPackagesDir> <ToolsetPackagesDir>$(RepoRoot)build\ToolsetPackages\</ToolsetPackagesDir>
<ToolsetPackagesSemaphore>$(ToolsetPackagesDir)toolsetpackages.semaphore</ToolsetPackagesSemaphore>
<ToolsetCompilerPackageName>Microsoft.Net.Compilers</ToolsetCompilerPackageName>
<ToolsetCompilerPackageVersion>2.0.1</ToolsetCompilerPackageVersion>
<VSIXExpInstallerPackageName>RoslynTools.Microsoft.VSIXExpInstaller</VSIXExpInstallerPackageName> <VSIXExpInstallerPackageName>RoslynTools.Microsoft.VSIXExpInstaller</VSIXExpInstallerPackageName>
<VSIXExpInstallerPackageVersion>0.2.1-beta</VSIXExpInstallerPackageVersion> <VSIXExpInstallerPackageVersion>0.2.1-beta</VSIXExpInstallerPackageVersion>
<RoslynDiagnosticsNugetPackageVersion>2.0.0-beta1-61628-06</RoslynDiagnosticsNugetPackageVersion> <RoslynDiagnosticsNugetPackageVersion>2.0.0-beta1-61628-06</RoslynDiagnosticsNugetPackageVersion>
...@@ -31,13 +28,15 @@ ...@@ -31,13 +28,15 @@
<BaseIntermediateOutputPath>$(BaseIntermediateOutputPath)$(MSBuildProjectName)\</BaseIntermediateOutputPath> <BaseIntermediateOutputPath>$(BaseIntermediateOutputPath)$(MSBuildProjectName)\</BaseIntermediateOutputPath>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)</IntermediateOutputPath> <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)</IntermediateOutputPath>
<NetStandard20RefPath>$(NuGetPackageRoot)/NETStandard.Library/$(NETStandardLibraryFixedVersion)/build/netstandard2.0/ref/</NetStandard20RefPath> <NetStandard20RefPath>$(NuGetPackageRoot)/netstandard.library/$(NETStandardLibraryFixedVersion)/build/netstandard2.0/ref/</NetStandard20RefPath>
<MicrosoftCSharpRefPath>$(NuGetPackageRoot)/Microsoft.CSharp/$(MicrosoftCSharpVersion)/ref/netstandard1.0/</MicrosoftCSharpRefPath> <MicrosoftCSharpRefPath>$(NuGetPackageRoot)/microsoft.csharp/$(MicrosoftCSharpVersion)/ref/netstandard1.0/</MicrosoftCSharpRefPath>
<!-- Workaround until we move to Microsoft.Net.Compilers.nupkg with this fix: https://github.com/dotnet/roslyn/commit/05c12ebfcdd08a02dbceded5327a8da7a7df23be: <ToolsetPackagesSemaphore>$(ToolsetPackagesDir)toolsetpackages.semaphore</ToolsetPackagesSemaphore>
Use the Microsoft.Net.Compilers.props file with the fix checked into the repo instead of the one that comes along with the nuget package: <ToolsetCompilerPackageName Condition="'$(OS)' == 'Windows_NT'">Microsoft.Net.Compilers</ToolsetCompilerPackageName>
$(NuGetPackageRoot)\Microsoft.Net.Compilers\$(ToolsetCompilerPackageVersion)\build\Microsoft.Net.Compilers.props --> <ToolsetCompilerPackageName Condition="'$(OS)' != 'Windows_NT'">Microsoft.NETCore.Compilers</ToolsetCompilerPackageName>
<ToolsetCompilerPropsFilePath>$(MSBuildThisFileDirectory)Microsoft.Net.Compilers.props</ToolsetCompilerPropsFilePath> <ToolsetCompilerPackageVersion Condition="'$(OS)' == 'Windows_NT'">$(MicrosoftNetCompilersVersion)</ToolsetCompilerPackageVersion>
<ToolsetCompilerPackageVersion Condition="'$(OS)' != 'Windows_NT'">$(MicrosoftNETCoreCompilersVersion)</ToolsetCompilerPackageVersion>
<ToolsetCompilerPropsFilePath>$(NuGetPackageRoot)/$(ToolsetCompilerPackageName.ToLower())/$(ToolsetCompilerPackageVersion)/build/$(ToolsetCompilerPackageName).props</ToolsetCompilerPropsFilePath>
<TargetFrameworkRootPath>$(NuGetPackageRoot)\RoslynTools.ReferenceAssemblies\$(RoslynToolsReferenceAssembliesVersion)\tools\Framework</TargetFrameworkRootPath> <TargetFrameworkRootPath>$(NuGetPackageRoot)\RoslynTools.ReferenceAssemblies\$(RoslynToolsReferenceAssembliesVersion)\tools\Framework</TargetFrameworkRootPath>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
...@@ -74,8 +73,8 @@ ...@@ -74,8 +73,8 @@
https://github.com/dotnet/sdk/issues/1083#issuecomment-292013375 https://github.com/dotnet/sdk/issues/1083#issuecomment-292013375
This needs to be conditional to support a fresh restore --> This needs to be conditional to support a fresh restore -->
<!-- <RoslynNetSdkRootPath>$(NuGetPackageRoot)\Microsoft.Net.Sdk\$(MicrosoftNetSdkVersion)\Sdk\</RoslynNetSdkRootPath> --> <!-- <RoslynNetSdkRootPath>$(NuGetPackageRoot)\Microsoft.NET.Sdk\$(MicrosoftNetSdkVersion)\Sdk\</RoslynNetSdkRootPath> -->
<RoslynNetSdkRootPath>$(MSBuildSDKsPath)\Microsoft.Net.Sdk\Sdk\</RoslynNetSdkRootPath> <RoslynNetSdkRootPath>$(MSBuildSDKsPath)\Microsoft.NET.Sdk\Sdk\</RoslynNetSdkRootPath>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle> <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup> </PropertyGroup>
...@@ -224,16 +223,6 @@ ...@@ -224,16 +223,6 @@
AssemblyFile="$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll" AssemblyFile="$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
Condition="'$(BootstrapBuildPath)' != ''" /> Condition="'$(BootstrapBuildPath)' != ''" />
<!--
Roslyn uses the WriteCodeFragment task to output generated assembly attributes. In MSBuild 14.0 update 1 this task
produces non-deterministic output. This is fixed in update 2 but until that is released we use a hand patched
version of the Task that is deterministic.
MSBuild bug: https://github.com/Microsoft/msbuild/issues/408
Bug tracking removing this: https://github.com/dotnet/roslyn/issues/8421
-->
<UsingTask TaskName="Roslyn.MSBuild.Util.WriteCodeFragmentEx" AssemblyFile="$(RoslynBuildUtilFilePath)" />
<!-- This file is imported by all projects at the beginning of the project files --> <!-- This file is imported by all projects at the beginning of the project files -->
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props') AND '$(RoslynSdkProject)' != 'true'" /> Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props') AND '$(RoslynSdkProject)' != 'true'" />
...@@ -244,13 +233,9 @@ ...@@ -244,13 +233,9 @@
<ImportGroup Label="WindowsImports" Condition="'$(OS)' == 'Windows_NT'"> <ImportGroup Label="WindowsImports" Condition="'$(OS)' == 'Windows_NT'">
<Import Project="$(NuGetPackageRoot)\Microsoft.VSSDK.BuildTools\$(VisualStudioBuildToolsVersion)\build\Microsoft.VsSDK.BuildTools.props" /> <Import Project="$(NuGetPackageRoot)\Microsoft.VSSDK.BuildTools\$(VisualStudioBuildToolsVersion)\build\Microsoft.VsSDK.BuildTools.props" />
<Import Project="$(ToolsetCompilerPropsFilePath)" Condition="Exists('$(ToolsetCompilerPropsFilePath)') AND '$(BootstrapBuildPath)' == ''" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="WindowsImports" Condition="'$(OS)' != 'Windows_NT'"> <Import Project="$(ToolsetCompilerPropsFilePath)" Condition="Exists('$(ToolsetCompilerPropsFilePath)') AND '$(BootstrapBuildPath)' == ''" />
<!-- NuGet props aren't imported by default on *nix so we do that here -->
<Import Project="$(MSBuildBinPath)\Microsoft.NuGet.props" Condition="'$(OS)' != 'Windows_NT'" />
</ImportGroup>
<!-- The Sdk props will set the rootnamespace to the assembly name when the property <!-- The Sdk props will set the rootnamespace to the assembly name when the property
is empty. Need to override this after --> is empty. Need to override this after -->
......
build/Targets/Versions.props
浏览文件 @ 62b1ad0b
...@@ -49,6 +49,8 @@ ...@@ -49,6 +49,8 @@
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' AND '$(OS)' == 'Windows_NT'">$(UserProfile)/.nuget/packages/</NuGetPackageRoot> <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' AND '$(OS)' == 'Windows_NT'">$(UserProfile)/.nuget/packages/</NuGetPackageRoot>
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' AND '$(OS)' != 'Windows_NT'">$(HOME)/.nuget/packages/</NuGetPackageRoot> <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' AND '$(OS)' != 'Windows_NT'">$(HOME)/.nuget/packages/</NuGetPackageRoot>
<NuGetPackagesDirectory>$(NuGetPackageRoot)</NuGetPackagesDirectory> <NuGetPackagesDirectory>$(NuGetPackageRoot)</NuGetPackagesDirectory>
<Version Condition="$(Version) == ''">$(NuGetPerBuildPreReleaseVersion)</Version>
</PropertyGroup> </PropertyGroup>
<Choose> <Choose>
......
build/ToolsetPackages/BaseToolset.csproj
浏览文件 @ 62b1ad0b
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" /> <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" /> <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" />
<PackageReference Include="Microsoft.Net.Compilers" Version="$(MicrosoftNetCompilersVersion)" /> <PackageReference Include="Microsoft.Net.Compilers" Version="$(MicrosoftNetCompilersVersion)" />
<PackageReference Include="Microsoft.NETCore.Compilers" Version="$(MicrosoftNETCoreCompilersVersion)" />
<PackageReference Include="Microsoft.Net.RoslynDiagnostics" Version="$(MicrosoftNetRoslynDiagnosticsVersion)" /> <PackageReference Include="Microsoft.Net.RoslynDiagnostics" Version="$(MicrosoftNetRoslynDiagnosticsVersion)" />
<PackageReference Include="FakeSign" Version="$(FakeSignVersion)" /> <PackageReference Include="FakeSign" Version="$(FakeSignVersion)" />
<PackageReference Include="xunit" Version="$(xunitVersion)" /> <PackageReference Include="xunit" Version="$(xunitVersion)" />
......
cibuild.sh
浏览文件 @ 62b1ad0b
...@@ -81,11 +81,6 @@ if [ "$CLEAN_RUN" == "true" ]; then ...@@ -81,11 +81,6 @@ if [ "$CLEAN_RUN" == "true" ]; then
git clean -dxf . git clean -dxf .
fi fi
if [ "$USE_CACHE" == "false" ]; then
echo Clean out the toolsets
$MAKE clean_toolset
fi
if [ "$SKIP_COMMIT_PRINTING" == "false" ]; then if [ "$SKIP_COMMIT_PRINTING" == "false" ]; then
echo Building this commit: echo Building this commit:
git show --no-patch --pretty=raw HEAD git show --no-patch --pretty=raw HEAD
......
src/CodeStyle/VisualBasic/Analyzers/BasicCodeStyle.vbproj
浏览文件 @ 62b1ad0b
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<AssemblyName>Microsoft.CodeAnalysis.VisualBasic.CodeStyle</AssemblyName> <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.CodeStyle</AssemblyName>
<TargetFramework>netstandard1.3</TargetFramework> <TargetFramework>netstandard1.3</TargetFramework>
<PackageTargetFallback>portable-net45+win8;dotnet</PackageTargetFallback> <PackageTargetFallback>portable-net45+win8;dotnet</PackageTargetFallback>
<ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj"> <ProjectReference Include="..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
......
src/CodeStyle/VisualBasic/CodeFixes/BasicCodeStyleFixes.vbproj
浏览文件 @ 62b1ad0b
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<AssemblyName>Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes</AssemblyName> <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes</AssemblyName>
<TargetFramework>netstandard1.3</TargetFramework> <TargetFramework>netstandard1.3</TargetFramework>
<PackageTargetFallback>portable-net45+win8;dotnet</PackageTargetFallback> <PackageTargetFallback>portable-net45+win8;dotnet</PackageTargetFallback>
<ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj"> <ProjectReference Include="..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
......
src/CodeStyle/VisualBasic/Tests/BasicCodeStyleTests.vbproj
浏览文件 @ 62b1ad0b
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<AssemblyName>Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests</AssemblyName> <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests</AssemblyName>
<TargetFramework>netstandard1.3</TargetFramework> <TargetFramework>netstandard1.3</TargetFramework>
<PackageTargetFallback>portable-net45+win8;dotnet</PackageTargetFallback> <PackageTargetFallback>portable-net45+win8;dotnet</PackageTargetFallback>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
<RoslynProjectType>UnitTestPortable</RoslynProjectType> <RoslynProjectType>UnitTestPortable</RoslynProjectType>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
......
src/Compilers/CSharp/CscCore/CscCore.csproj
浏览文件 @ 62b1ad0b
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<PropertyGroup> <PropertyGroup>
<Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<RuntimeIdentifier>x64</RuntimeIdentifier>
<ProjectGuid>{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}</ProjectGuid> <ProjectGuid>{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>Microsoft.CodeAnalysis.CSharp.CommandLine</RootNamespace> <RootNamespace>Microsoft.CodeAnalysis.CSharp.CommandLine</RootNamespace>
...@@ -30,16 +29,11 @@ ...@@ -30,16 +29,11 @@
<Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project> <Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
<Name>CSharpCodeAnalysis</Name> <Name>CSharpCodeAnalysis</Name>
</ProjectReference> </ProjectReference>
<PackageReference Include="System.AppContext" Version="$(SystemAppContextVersion)" /> </ItemGroup>
<PackageReference Include="System.Console" Version="$(SystemConsoleVersion)" /> <ItemGroup Label="Package References">
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" /> <PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
<PackageReference Include="System.Net.NameResolution" Version="$(SystemNetNameResolutionVersion)" /> <PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppVersion)" />
<PackageReference Include="System.Net.Sockets" Version="$(SystemNetSocketsVersion)" />
<PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadVersion)" />
</ItemGroup> </ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
<ItemGroup> <ItemGroup>
<Compile Include="..\..\Shared\BuildClient.cs"> <Compile Include="..\..\Shared\BuildClient.cs">
<Link>BuildClient.cs</Link> <Link>BuildClient.cs</Link>
...@@ -58,14 +52,6 @@ ...@@ -58,14 +52,6 @@
<ItemGroup> <ItemGroup>
<InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.CommandLine.UnitTests" /> <InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.CommandLine.UnitTests" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="csc.cmd">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="csc">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<Import Project="..\..\Core\CommandLine\CommandLine.projitems" Label="Shared" /> <Import Project="..\..\Core\CommandLine\CommandLine.projitems" Label="Shared" />
<Import Project="..\..\..\..\build\Targets\Imports.targets" /> <Import Project="..\..\..\..\build\Targets\Imports.targets" />
</Project> </Project>
src/Compilers/CSharp/CscCore/csc 已删除 100755 → 0
浏览文件 @ 107f19ba
#!/bin/sh
THISDIR=$(dirname $0)
# CoreCLR / CoreFX does not execute reliably with an unlimited
# stack. Make on Linux can execute child processes with an
# unlimited stack so force it back to a known good limit
#
# https://github.com/dotnet/coreclr/issues/2467
ulimit -s 8192
chmod +x $THISDIR/corerun 2>/dev/null
$THISDIR/corerun $THISDIR/csc.exe "$@"
src/Compilers/CSharp/CscCore/csc.cmd 已删除 100644 → 0
浏览文件 @ 107f19ba
echo off
%~dp0\corerun.exe %~dp0\csc.exe %*
src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj
浏览文件 @ 62b1ad0b
...@@ -173,7 +173,6 @@ ...@@ -173,7 +173,6 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="microsoft.netcore.portable.compatibility" Version="$(microsoftnetcoreportablecompatibilityVersion)" />
<PackageReference Include="System.Linq.Parallel" Version="$(SystemLinqParallelVersion)" /> <PackageReference Include="System.Linq.Parallel" Version="$(SystemLinqParallelVersion)" />
<PackageReference Include="xunit" Version="$(xunitVersion)" /> <PackageReference Include="xunit" Version="$(xunitVersion)" />
<PackageReference Include="xunit.runner.console" Version="$(xunitrunnerconsoleVersion)" /> <PackageReference Include="xunit.runner.console" Version="$(xunitrunnerconsoleVersion)" />
......
src/Compilers/Core/Portable/CodeAnalysis.csproj
浏览文件 @ 62b1ad0b
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
<ItemGroup> <ItemGroup>
<Content Include="$(NuGetPackageRoot)\Microsoft.DiaSymReader.Native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\win\native\Microsoft.DiaSymReader.Native.x86.dll"> <Content Include="$(NuGetPackageRoot)\microsoft.diasymreader.native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\win\native\Microsoft.DiaSymReader.Native.x86.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible> <Visible>false</Visible>
</Content> </Content>
<Content Include="$(NuGetPackageRoot)\Microsoft.DiaSymReader.Native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\win\native\Microsoft.DiaSymReader.Native.amd64.dll"> <Content Include="$(NuGetPackageRoot)\microsoft.diasymreader.native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\win\native\Microsoft.DiaSymReader.Native.amd64.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible> <Visible>false</Visible>
</Content> </Content>
......
src/Compilers/VisualBasic/VbcCore/VbcCore.csproj
浏览文件 @ 62b1ad0b
...@@ -52,63 +52,8 @@ ...@@ -52,63 +52,8 @@
<InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.CommandLine.UnitTests" /> <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.CommandLine.UnitTests" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="vbc"> <PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppVersion)" />
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="vbc.cmd">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
<PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR" Version="$(MicrosoftNETCoreRuntimeCoreCLRVersion)" />
<PackageReference Include="Microsoft.NETCore.TestHost" Version="$(MicrosoftNETCoreTestHostVersion)" />
<PackageReference Include="System.AppContext" Version="$(SystemAppContextVersion)" />
<PackageReference Include="System.Collections" Version="$(SystemCollectionsVersion)" />
<PackageReference Include="System.Collections.Concurrent" Version="$(SystemCollectionsConcurrentVersion)" />
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
<PackageReference Include="System.Console" Version="$(SystemConsoleVersion)" />
<PackageReference Include="System.Diagnostics.Debug" Version="$(SystemDiagnosticsDebugVersion)" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="$(SystemDiagnosticsFileVersionInfoVersion)" />
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
<PackageReference Include="System.Diagnostics.StackTrace" Version="$(SystemDiagnosticsStackTraceVersion)" />
<PackageReference Include="System.Diagnostics.Tools" Version="$(SystemDiagnosticsToolsVersion)" />
<PackageReference Include="System.Dynamic.Runtime" Version="$(SystemDynamicRuntimeVersion)" />
<PackageReference Include="System.Globalization" Version="$(SystemGlobalizationVersion)" />
<PackageReference Include="System.IO.Compression" Version="$(SystemIOCompressionVersion)" />
<PackageReference Include="System.IO.FileSystem" Version="$(SystemIOFileSystemVersion)" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="$(SystemIOFileSystemPrimitivesVersion)" />
<PackageReference Include="System.IO.FileSystem.Watcher" Version="$(SystemIOFileSystemWatcherVersion)" />
<PackageReference Include="System.IO.Pipes" Version="$(SystemIOPipesVersion)" />
<PackageReference Include="System.Linq" Version="$(SystemLinqVersion)" />
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
<PackageReference Include="System.Net.NameResolution" Version="$(SystemNetNameResolutionVersion)" />
<PackageReference Include="System.Net.Sockets" Version="$(SystemNetSocketsVersion)" />
<PackageReference Include="System.Reflection" Version="$(SystemReflectionVersion)" />
<PackageReference Include="System.Reflection.Primitives" Version="$(SystemReflectionPrimitivesVersion)" />
<PackageReference Include="System.Resources.ResourceManager" Version="$(SystemResourcesResourceManagerVersion)" />
<PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" />
<PackageReference Include="System.Runtime.Extensions" Version="$(SystemRuntimeExtensionsVersion)" />
<PackageReference Include="System.Runtime.Handles" Version="$(SystemRuntimeHandlesVersion)" />
<PackageReference Include="System.Runtime.InteropServices" Version="$(SystemRuntimeInteropServicesVersion)" />
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" /> <PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
<PackageReference Include="System.Runtime.Numerics" Version="$(SystemRuntimeNumericsVersion)" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="$(SystemRuntimeSerializationPrimitivesVersion)" />
<PackageReference Include="System.Runtime.Serialization.Json" Version="$(SystemRuntimeSerializationJsonVersion)" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="$(SystemSecurityCryptographyAlgorithmsVersion)" />
<PackageReference Include="System.Security.Cryptography.Encoding" Version="$(SystemSecurityCryptographyEncodingVersion)" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="$(SystemSecurityCryptographyX509CertificatesVersion)" />
<PackageReference Include="System.Text.Encoding" Version="$(SystemTextEncodingVersion)" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesVersion)" />
<PackageReference Include="System.Text.Encoding.Extensions" Version="$(SystemTextEncodingExtensionsVersion)" />
<PackageReference Include="System.Threading" Version="$(SystemThreadingVersion)" />
<PackageReference Include="System.Threading.Tasks" Version="$(SystemThreadingTasksVersion)" />
<PackageReference Include="System.Threading.Tasks.Parallel" Version="$(SystemThreadingTasksParallelVersion)" />
<PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadVersion)" />
<PackageReference Include="System.Xml.ReaderWriter" Version="$(SystemXmlReaderWriterVersion)" />
<PackageReference Include="System.Xml.XDocument" Version="$(SystemXmlXDocumentVersion)" />
<PackageReference Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentVersion)" />
<PackageReference Include="System.Xml.XPath.XDocument" Version="$(SystemXmlXPathXDocumentVersion)" />
</ItemGroup> </ItemGroup>
<Import Project="..\..\Core\CommandLine\CommandLine.projitems" Label="Shared" /> <Import Project="..\..\Core\CommandLine\CommandLine.projitems" Label="Shared" />
<Import Project="..\..\..\..\build\Targets\Imports.targets" /> <Import Project="..\..\..\..\build\Targets\Imports.targets" />
......
src/Compilers/VisualBasic/VbcCore/vbc 已删除 100755 → 0
浏览文件 @ 107f19ba
#!/bin/sh
THISDIR=$(dirname $0)
# CoreCLR / CoreFX does not execute reliably with an unlimited
# stack. Make on Linux can execute child processes with an
# unlimited stack so force it back to a known good limit
#
# https://github.com/dotnet/coreclr/issues/2467
ulimit -s 8192
chmod +x $THISDIR/corerun 2>/dev/null
$THISDIR/corerun $THISDIR/vbc.exe "$@"
src/Compilers/VisualBasic/VbcCore/vbc.cmd 已删除 100644 → 0
浏览文件 @ 107f19ba
echo off
%~dp0\corerun.exe %~dp0\vbc.exe %*
src/Scripting/CSharpTest/ObjectFormatterTests.cs
浏览文件 @ 62b1ad0b
...@@ -834,7 +834,9 @@ public static void Method<U>() ...@@ -834,7 +834,9 @@ public static void Method<U>()
} }
} }
[ConditionalFact(typeof(WindowsOnly)), WorkItem(15860, "https://github.com/dotnet/roslyn/issues/15860")] [Fact(Skip = "https://github.com/dotnet/roslyn/issues/19027")]
[WorkItem(15860, "https://github.com/dotnet/roslyn/issues/15860")]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public void StackTrace_NonGeneric() public void StackTrace_NonGeneric()
{ {
try try
...@@ -855,7 +857,9 @@ public void StackTrace_NonGeneric() ...@@ -855,7 +857,9 @@ public void StackTrace_NonGeneric()
} }
} }
[ConditionalFact(typeof(WindowsOnly)), WorkItem(15860, "https://github.com/dotnet/roslyn/issues/15860")] [Fact(Skip = "https://github.com/dotnet/roslyn/issues/19027")]
[WorkItem(15860, "https://github.com/dotnet/roslyn/issues/15860")]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public void StackTrace_GenericMethod() public void StackTrace_GenericMethod()
{ {
try try
...@@ -877,7 +881,9 @@ public void StackTrace_GenericMethod() ...@@ -877,7 +881,9 @@ public void StackTrace_GenericMethod()
} }
} }
[ConditionalFact(typeof(WindowsOnly)), WorkItem(15860, "https://github.com/dotnet/roslyn/issues/15860")] [Fact(Skip = "https://github.com/dotnet/roslyn/issues/19027")]
[WorkItem(15860, "https://github.com/dotnet/roslyn/issues/15860")]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public void StackTrace_GenericType() public void StackTrace_GenericType()
{ {
try try
...@@ -899,7 +905,9 @@ public void StackTrace_GenericType() ...@@ -899,7 +905,9 @@ public void StackTrace_GenericType()
} }
} }
[ConditionalFact(typeof(WindowsOnly)), WorkItem(15860, "https://github.com/dotnet/roslyn/issues/15860")] [Fact(Skip = "https://github.com/dotnet/roslyn/issues/19027")]
[WorkItem(15860, "https://github.com/dotnet/roslyn/issues/15860")]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public void StackTrace_GenericMethodInGenericType() public void StackTrace_GenericMethodInGenericType()
{ {
try try
...@@ -931,6 +939,7 @@ public static void MethodDynamic() ...@@ -931,6 +939,7 @@ public static void MethodDynamic()
} }
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/9221"), WorkItem(9221, "https://github.com/dotnet/roslyn/issues/9221")] [Fact(Skip = "https://github.com/dotnet/roslyn/issues/9221"), WorkItem(9221, "https://github.com/dotnet/roslyn/issues/9221")]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public void StackTrace_Dynamic() public void StackTrace_Dynamic()
{ {
try try
...@@ -968,7 +977,9 @@ public static void Method<U>(ref U u) ...@@ -968,7 +977,9 @@ public static void Method<U>(ref U u)
} }
} }
[ConditionalFact(typeof(WindowsOnly)), WorkItem(15860, "https://github.com/dotnet/roslyn/issues/15860")] [Fact(Skip = "https://github.com/dotnet/roslyn/issues/19027")]
[WorkItem(15860, "https://github.com/dotnet/roslyn/issues/15860")]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public void StackTrace_RefOutParameters() public void StackTrace_RefOutParameters()
{ {
try try
...@@ -991,7 +1002,9 @@ public void StackTrace_RefOutParameters() ...@@ -991,7 +1002,9 @@ public void StackTrace_RefOutParameters()
} }
} }
[ConditionalFact(typeof(WindowsOnly)), WorkItem(15860, "https://github.com/dotnet/roslyn/issues/15860")] [Fact(Skip = "https://github.com/dotnet/roslyn/issues/19027")]
[WorkItem(15860, "https://github.com/dotnet/roslyn/issues/15860")]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public void StackTrace_GenericRefParameter() public void StackTrace_GenericRefParameter()
{ {
try try
......
src/Scripting/CSharpTest/ScriptTests.cs
浏览文件 @ 62b1ad0b
...@@ -802,7 +802,8 @@ public async Task Pdb_CreateFromString_CodeFromFile_WithEmitDebugInformation_Wit ...@@ -802,7 +802,8 @@ public async Task Pdb_CreateFromString_CodeFromFile_WithEmitDebugInformation_Wit
} }
} }
[Fact] [ConditionalFact(typeof(DesktopOnly))]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public Task Pdb_CreateFromString_CodeFromFile_WithEmitDebugInformation_WithFileEncoding_ResultInPdbEmitted() public Task Pdb_CreateFromString_CodeFromFile_WithEmitDebugInformation_WithFileEncoding_ResultInPdbEmitted()
{ {
var opts = ScriptOptions.Default.WithEmitDebugInformation(true).WithFilePath("debug.csx").WithFileEncoding(Encoding.UTF8); var opts = ScriptOptions.Default.WithEmitDebugInformation(true).WithFilePath("debug.csx").WithFileEncoding(Encoding.UTF8);
...@@ -823,7 +824,8 @@ public Task Pdb_CreateFromString_CodeFromFile_WithoutEmitDebugInformation_WithFi ...@@ -823,7 +824,8 @@ public Task Pdb_CreateFromString_CodeFromFile_WithoutEmitDebugInformation_WithFi
return VerifyStackTraceAsync(() => CSharpScript.Create("throw new System.Exception();", opts)); return VerifyStackTraceAsync(() => CSharpScript.Create("throw new System.Exception();", opts));
} }
[Fact] [ConditionalFact(typeof(DesktopOnly))]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public Task Pdb_CreateFromStream_CodeFromFile_WithEmitDebugInformation_ResultInPdbEmitted() public Task Pdb_CreateFromStream_CodeFromFile_WithEmitDebugInformation_ResultInPdbEmitted()
{ {
var opts = ScriptOptions.Default.WithEmitDebugInformation(true).WithFilePath("debug.csx"); var opts = ScriptOptions.Default.WithEmitDebugInformation(true).WithFilePath("debug.csx");
...@@ -837,14 +839,16 @@ public Task Pdb_CreateFromStream_CodeFromFile_WithoutEmitDebugInformation_Result ...@@ -837,14 +839,16 @@ public Task Pdb_CreateFromStream_CodeFromFile_WithoutEmitDebugInformation_Result
return VerifyStackTraceAsync(() => CSharpScript.Create(new MemoryStream(Encoding.UTF8.GetBytes("throw new System.Exception();")), opts)); return VerifyStackTraceAsync(() => CSharpScript.Create(new MemoryStream(Encoding.UTF8.GetBytes("throw new System.Exception();")), opts));
} }
[Fact] [ConditionalFact(typeof(DesktopOnly))]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public Task Pdb_CreateFromString_InlineCode_WithEmitDebugInformation_WithoutFileEncoding_ResultInPdbEmitted() public Task Pdb_CreateFromString_InlineCode_WithEmitDebugInformation_WithoutFileEncoding_ResultInPdbEmitted()
{ {
var opts = ScriptOptions.Default.WithEmitDebugInformation(true).WithFileEncoding(null); var opts = ScriptOptions.Default.WithEmitDebugInformation(true).WithFileEncoding(null);
return VerifyStackTraceAsync(() => CSharpScript.Create("throw new System.Exception();", opts), line: 1, column: 1, filename: ""); return VerifyStackTraceAsync(() => CSharpScript.Create("throw new System.Exception();", opts), line: 1, column: 1, filename: "");
} }
[Fact] [ConditionalFact(typeof(DesktopOnly))]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public Task Pdb_CreateFromString_InlineCode_WithEmitDebugInformation_WithFileEncoding_ResultInPdbEmitted() public Task Pdb_CreateFromString_InlineCode_WithEmitDebugInformation_WithFileEncoding_ResultInPdbEmitted()
{ {
var opts = ScriptOptions.Default.WithEmitDebugInformation(true).WithFileEncoding(Encoding.UTF8); var opts = ScriptOptions.Default.WithEmitDebugInformation(true).WithFileEncoding(Encoding.UTF8);
...@@ -865,7 +869,8 @@ public Task Pdb_CreateFromString_InlineCode_WithoutEmitDebugInformation_WithFile ...@@ -865,7 +869,8 @@ public Task Pdb_CreateFromString_InlineCode_WithoutEmitDebugInformation_WithFile
return VerifyStackTraceAsync(() => CSharpScript.Create("throw new System.Exception();", opts)); return VerifyStackTraceAsync(() => CSharpScript.Create("throw new System.Exception();", opts));
} }
[Fact] [ConditionalFact(typeof(DesktopOnly))]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public Task Pdb_CreateFromStream_InlineCode_WithEmitDebugInformation_ResultInPdbEmitted() public Task Pdb_CreateFromStream_InlineCode_WithEmitDebugInformation_ResultInPdbEmitted()
{ {
var opts = ScriptOptions.Default.WithEmitDebugInformation(true); var opts = ScriptOptions.Default.WithEmitDebugInformation(true);
......
src/Scripting/Core/Scripting.csproj
浏览文件 @ 62b1ad0b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
<ItemGroup> <ItemGroup>
<!-- Workaround for https://github.com/NuGet/Home/issues/1471 --> <!-- Workaround for https://github.com/NuGet/Home/issues/1471 -->
<Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\$(SystemRuntimeLoaderVersion)\ref\netstandard1.5\System.Runtime.Loader.dll"> <Reference Include="$(NuGetPackageRoot)\system.runtime.loader\$(SystemRuntimeLoaderVersion)\ref\netstandard1.5\System.Runtime.Loader.dll">
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<PackageReference Include="System.AppContext" Version="$(SystemAppContextVersion)" /> <PackageReference Include="System.AppContext" Version="$(SystemAppContextVersion)" />
......
src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj
浏览文件 @ 62b1ad0b
...@@ -5,20 +5,15 @@ ...@@ -5,20 +5,15 @@
<PropertyGroup> <PropertyGroup>
<Platform Condition="'$(Platform)' == ''">x64</Platform> <Platform Condition="'$(Platform)' == ''">x64</Platform>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
<RuntimeIdentifier>x64</RuntimeIdentifier>
<ProjectGuid>{59BABFC3-C19B-4472-A93D-3DD3835BC219}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<AssemblyName>DeployCoreClrTestRuntime_DoNotUse</AssemblyName> <AssemblyName>DeployCoreClrTestRuntime_DoNotUse</AssemblyName>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
<AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects> <TargetFramework>netcoreapp2.0</TargetFramework>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFramework>netcoreapp1.1</TargetFramework>
<RuntimeIdentifiers>win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64</RuntimeIdentifiers>
<PackageTargetFallback>portable-net452;dotnet;netstandard1.6</PackageTargetFallback> <PackageTargetFallback>portable-net452;dotnet;netstandard1.6</PackageTargetFallback>
<NoStdLib>true</NoStdLib>
<RoslynProjectType>DeploymentTest</RoslynProjectType>
<RoslynUnitTestDir>CoreClrTest</RoslynUnitTestDir> <RoslynUnitTestDir>CoreClrTest</RoslynUnitTestDir>
<SelfContained>true</SelfContained>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" />
...@@ -141,9 +136,9 @@ ...@@ -141,9 +136,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="xunit.console.netcore" Version="$(xunitconsolenetcoreVersion)" /> <PackageReference Include="xunit.console.netcore" Version="$(xunitconsolenetcoreVersion)" />
<PackageReference Include="Microsoft.NETCore.ILAsm" Version="$(MicrosoftNETCoreILAsmVersion)" /> <PackageReference Include="Microsoft.NETCore.App" Version="2.0.0-preview2-002066-00" />
<PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR" Version="$(MicrosoftNETCoreRuntimeCoreCLRVersion)" /> <PackageReference Include="Microsoft.NETCore.ILAsm" Version="$(MicrosoftNetCoreIlasmVersion)" />
<PackageReference Include="Microsoft.NETCore.TestHost" Version="$(MicrosoftNETCoreTestHostVersion)" /> <PackageReference Include="Microsoft.NETCore.TestHost" Version="$(MicrosoftNetCoreTestHostVersion)" />
<PackageReference Include="System.AppContext" Version="$(SystemAppContextVersion)" /> <PackageReference Include="System.AppContext" Version="$(SystemAppContextVersion)" />
<PackageReference Include="System.Console" Version="$(SystemConsoleVersion)" /> <PackageReference Include="System.Console" Version="$(SystemConsoleVersion)" />
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" /> <PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或