Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
24e3fd5c
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
24e3fd5c
编写于
9月 03, 2019
作者:
R
Rikki Gibson
提交者:
GitHub
9月 03, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #38434 from dotnet/merges/release/dev16.3-to-master
Merge release/dev16.3 to master
上级
889a6427
90bc7c5f
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
97 addition
and
5 deletion
+97
-5
SourceBuild.sln
SourceBuild.sln
+50
-2
azure-pipelines.yml
azure-pipelines.yml
+17
-0
eng/build.ps1
eng/build.ps1
+6
-0
eng/build.sh
eng/build.sh
+9
-0
eng/targets/Imports.targets
eng/targets/Imports.targets
+2
-2
eng/targets/Settings.props
eng/targets/Settings.props
+6
-0
src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
...es/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
+2
-1
src/Workspaces/Core/Portable/Storage/PersistenceStorageServiceFactory.cs
...Core/Portable/Storage/PersistenceStorageServiceFactory.cs
+5
-0
未找到文件。
SourceBuild.sln
浏览文件 @
24e3fd5c
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio
15
VisualStudioVersion = 1
5.0.26228.10
# Visual Studio
Version 16
VisualStudioVersion = 1
6.0.29229.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6D173F59-562E-4BAA-8D98-9A8F4901D99A}"
EndProject
...
...
@@ -28,6 +28,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VBCSCompiler", "src\Compile
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{B57E7F86-EB16-4F60-A47C-F9D170F54400}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Workspaces", "src\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj", "{5889B407-1FC8-4713-9A15-AD91117C1D7B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workspaces", "Workspaces", "{839D0C7B-C07C-4EBC-B264-D9800729301D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.CSharp.Workspaces", "src\Workspaces\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj", "{8D000386-3349-4720-A75A-F2875DFCD446}"
EndProject
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "src\Workspaces\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj", "{F9F835CB-8238-401B-8BB5-917C45B759D0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
...
...
@@ -122,6 +130,42 @@ Global
{649CE05A-529C-40D7-A501-CA9BCFEE40DC}.Release|x64.Build.0 = Release|Any CPU
{649CE05A-529C-40D7-A501-CA9BCFEE40DC}.Release|x86.ActiveCfg = Release|Any CPU
{649CE05A-529C-40D7-A501-CA9BCFEE40DC}.Release|x86.Build.0 = Release|Any CPU
{5889B407-1FC8-4713-9A15-AD91117C1D7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5889B407-1FC8-4713-9A15-AD91117C1D7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5889B407-1FC8-4713-9A15-AD91117C1D7B}.Debug|x64.ActiveCfg = Debug|Any CPU
{5889B407-1FC8-4713-9A15-AD91117C1D7B}.Debug|x64.Build.0 = Debug|Any CPU
{5889B407-1FC8-4713-9A15-AD91117C1D7B}.Debug|x86.ActiveCfg = Debug|Any CPU
{5889B407-1FC8-4713-9A15-AD91117C1D7B}.Debug|x86.Build.0 = Debug|Any CPU
{5889B407-1FC8-4713-9A15-AD91117C1D7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5889B407-1FC8-4713-9A15-AD91117C1D7B}.Release|Any CPU.Build.0 = Release|Any CPU
{5889B407-1FC8-4713-9A15-AD91117C1D7B}.Release|x64.ActiveCfg = Release|Any CPU
{5889B407-1FC8-4713-9A15-AD91117C1D7B}.Release|x64.Build.0 = Release|Any CPU
{5889B407-1FC8-4713-9A15-AD91117C1D7B}.Release|x86.ActiveCfg = Release|Any CPU
{5889B407-1FC8-4713-9A15-AD91117C1D7B}.Release|x86.Build.0 = Release|Any CPU
{8D000386-3349-4720-A75A-F2875DFCD446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D000386-3349-4720-A75A-F2875DFCD446}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D000386-3349-4720-A75A-F2875DFCD446}.Debug|x64.ActiveCfg = Debug|Any CPU
{8D000386-3349-4720-A75A-F2875DFCD446}.Debug|x64.Build.0 = Debug|Any CPU
{8D000386-3349-4720-A75A-F2875DFCD446}.Debug|x86.ActiveCfg = Debug|Any CPU
{8D000386-3349-4720-A75A-F2875DFCD446}.Debug|x86.Build.0 = Debug|Any CPU
{8D000386-3349-4720-A75A-F2875DFCD446}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D000386-3349-4720-A75A-F2875DFCD446}.Release|Any CPU.Build.0 = Release|Any CPU
{8D000386-3349-4720-A75A-F2875DFCD446}.Release|x64.ActiveCfg = Release|Any CPU
{8D000386-3349-4720-A75A-F2875DFCD446}.Release|x64.Build.0 = Release|Any CPU
{8D000386-3349-4720-A75A-F2875DFCD446}.Release|x86.ActiveCfg = Release|Any CPU
{8D000386-3349-4720-A75A-F2875DFCD446}.Release|x86.Build.0 = Release|Any CPU
{F9F835CB-8238-401B-8BB5-917C45B759D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9F835CB-8238-401B-8BB5-917C45B759D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9F835CB-8238-401B-8BB5-917C45B759D0}.Debug|x64.ActiveCfg = Debug|Any CPU
{F9F835CB-8238-401B-8BB5-917C45B759D0}.Debug|x64.Build.0 = Debug|Any CPU
{F9F835CB-8238-401B-8BB5-917C45B759D0}.Debug|x86.ActiveCfg = Debug|Any CPU
{F9F835CB-8238-401B-8BB5-917C45B759D0}.Debug|x86.Build.0 = Debug|Any CPU
{F9F835CB-8238-401B-8BB5-917C45B759D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9F835CB-8238-401B-8BB5-917C45B759D0}.Release|Any CPU.Build.0 = Release|Any CPU
{F9F835CB-8238-401B-8BB5-917C45B759D0}.Release|x64.ActiveCfg = Release|Any CPU
{F9F835CB-8238-401B-8BB5-917C45B759D0}.Release|x64.Build.0 = Release|Any CPU
{F9F835CB-8238-401B-8BB5-917C45B759D0}.Release|x86.ActiveCfg = Release|Any CPU
{F9F835CB-8238-401B-8BB5-917C45B759D0}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
...
...
@@ -139,6 +183,10 @@ Global
{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3} = {5DC491BA-E836-47C1-A4AA-3C770742718B}
{649CE05A-529C-40D7-A501-CA9BCFEE40DC} = {B57E7F86-EB16-4F60-A47C-F9D170F54400}
{B57E7F86-EB16-4F60-A47C-F9D170F54400} = {DDFAE591-7414-4CC9-AD99-427C2D153893}
{5889B407-1FC8-4713-9A15-AD91117C1D7B} = {839D0C7B-C07C-4EBC-B264-D9800729301D}
{839D0C7B-C07C-4EBC-B264-D9800729301D} = {6D173F59-562E-4BAA-8D98-9A8F4901D99A}
{8D000386-3349-4720-A75A-F2875DFCD446} = {839D0C7B-C07C-4EBC-B264-D9800729301D}
{F9F835CB-8238-401B-8BB5-917C45B759D0} = {839D0C7B-C07C-4EBC-B264-D9800729301D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8157FCF4-7FB2-412F-883A-DC40977425EC}
...
...
azure-pipelines.yml
浏览文件 @
24e3fd5c
...
...
@@ -210,6 +210,23 @@ jobs:
continueOnError
:
true
condition
:
not(succeeded())
-
job
:
SourceBuild_Test
pool
:
name
:
NetCorePublic-Pool
queue
:
BuildPool.Ubuntu.1604.amd64.Open
timeoutInMinutes
:
90
steps
:
-
script
:
./eng/cibuild.sh --configuration Debug --prepareMachine --docker --sourceBuild
displayName
:
Build
-
task
:
PublishBuildArtifacts@1
displayName
:
Publish Logs
inputs
:
PathtoPublish
:
'
$(Build.SourcesDirectory)/artifacts/log/Debug'
ArtifactName
:
'
SourceBuild_Test'
publishLocation
:
Container
continueOnError
:
true
condition
:
not(succeeded())
-
job
:
macOS_Test
pool
:
vmImage
:
'
macOS-10.13'
...
...
eng/build.ps1
浏览文件 @
24e3fd5c
...
...
@@ -42,6 +42,7 @@ param (
[
switch
]
$prepareMachine
,
[
switch
]
$useGlobalNuGetCache
=
$true
,
[
switch
]
$warnAsError
=
$false
,
[
switch
]
$sourceBuild
=
$false
,
# official build settings
[
string
]
$officialBuildId
=
""
,
...
...
@@ -102,6 +103,7 @@ function Print-Usage() {
Write-Host
" -prepareMachine Prepare machine for CI run, clean up processes after build"
Write-Host
" -useGlobalNuGetCache Use global NuGet cache."
Write-Host
" -warnAsError Treat all warnings as errors"
Write-Host
" -sourceBuild Simulate building source-build"
Write-Host
""
Write-Host
"Official build settings:"
Write-Host
" -officialBuildId An official build id, e.g. 20190102.3"
...
...
@@ -233,6 +235,9 @@ function BuildSolution() {
# Workaround for some machines in the AzDO pool not allowing long paths (%5c is msbuild escaped backslash)
$ibcDir
=
Join-Path
$RepoRoot
".o%5c"
# Set DotNetBuildFromSource to 'true' if we're simulating building for source-build.
$buildFromSource
=
if
(
$sourceBuild
)
{
"/p:DotNetBuildFromSource=true"
}
else
{
""
}
try
{
MSBuild
$toolsetBuildProj
`
$bl
`
...
...
@@ -258,6 +263,7 @@ function BuildSolution() {
/p:IbcOptimizationDataDir
=
$ibcDir
`
$suppressExtensionDeployment
`
$msbuildWarnAsError
`
$buildFromSource
`
@
properties
}
finally
{
...
...
eng/build.sh
浏览文件 @
24e3fd5c
...
...
@@ -34,6 +34,7 @@ usage()
echo
" --skipAnalyzers Do not run analyzers during build operations"
echo
" --prepareMachine Prepare machine for CI run, clean up processes after build"
echo
" --warnAsError Treat all warnings as errors"
echo
" --sourceBuild Simulate building for source-build"
echo
""
echo
"Command line arguments starting with '/p:' are passed through to MSBuild."
}
...
...
@@ -68,6 +69,7 @@ prepare_machine=false
warn_as_error
=
false
properties
=
""
disable_parallel_restore
=
false
source_build
=
false
docker
=
false
args
=
""
...
...
@@ -141,6 +143,9 @@ while [[ $# > 0 ]]; do
shift
continue
;;
--sourcebuild
)
source_build
=
true
;;
/p:
*
)
properties
=
"
$properties
$1
"
;;
...
...
@@ -206,6 +211,9 @@ function MakeBootstrapBuild {
function
BuildSolution
{
local
solution
=
"Compilers.sln"
if
[[
"
$source_build
"
==
true
]]
;
then
solution
=
"SourceBuild.sln"
fi
echo
"
$solution
:"
InitializeToolset
...
...
@@ -274,6 +282,7 @@ function BuildSolution {
/p:TreatWarningsAsErrors
=
true
\
/p:RestoreDisableParallel
=
$disable_parallel_restore
\
/p:TestRuntimeAdditionalArguments
=
$test_runtime_args
\
/p:DotNetBuildFromSource
=
$source_build
\
$test_runtime
\
$mono_tool
\
$properties
...
...
eng/targets/Imports.targets
浏览文件 @
24e3fd5c
...
...
@@ -87,7 +87,7 @@
<Target
Name=
"_AddCommitHashAttribute"
DependsOnTargets=
"InitializeSourceControlInformation"
BeforeTargets=
"GetAssemblyAttributes"
Condition=
"'$(GenerateMicrosoftCodeAnalysisCommitHashAttribute)' == 'true'"
>
Condition=
"'$(GenerateMicrosoftCodeAnalysisCommitHashAttribute)' == 'true'
AND '$(SourceControlInformationFeatureSupported)' == 'true'
"
>
<ItemGroup>
<AssemblyAttribute
Include=
"Microsoft.CodeAnalysis.CommitHashAttribute"
>
<_Parameter1
Condition=
"'$(OfficialBuild)' == 'true'"
>
$(SourceRevisionId)
</_Parameter1>
...
...
@@ -186,7 +186,7 @@
<Target
Name=
"_AppendCommonPackageDescription"
BeforeTargets=
"InitializeStandardNuspecProperties;GenerateNuspec"
DependsOnTargets=
"InitializeSourceControlInformation"
Condition=
"'$(IsPackable)' == 'true'"
>
Condition=
"'$(IsPackable)' == 'true'
AND '$(SourceControlInformationFeatureSupported)' == 'true'
"
>
<PropertyGroup>
<PackageDescription>
$(PackageDescription)
...
...
eng/targets/Settings.props
浏览文件 @
24e3fd5c
...
...
@@ -194,4 +194,10 @@
</PropertyGroup>
</When>
</Choose>
<PropertyGroup
Condition=
"'$(DotNetBuildFromSource)' == 'true'"
>
<!-- https://github.com/dotnet/roslyn/issues/38433 Vbc does not like the extra semicolon -->
<DefineConstants
Condition=
"'$(DefineConstants)' != ''"
>
DOTNET_BUILD_FROM_SOURCE;$(DefineConstants)
</DefineConstants>
<DefineConstants
Condition=
"'$(DefineConstants)' == ''"
>
DOTNET_BUILD_FROM_SOURCE
</DefineConstants>
</PropertyGroup>
</Project>
src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
浏览文件 @
24e3fd5c
...
...
@@ -24,10 +24,11 @@
<ProjectReference
Include=
"..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj"
/>
</ItemGroup>
<ItemGroup>
<PackageReference
Include=
"SQLitePCLRaw.bundle_green"
Version=
"$(SQLitePCLRawbundle_greenVersion)"
PrivateAssets=
"all"
/>
<PackageReference
Include=
"SQLitePCLRaw.bundle_green"
Version=
"$(SQLitePCLRawbundle_greenVersion)"
PrivateAssets=
"all"
Condition=
"'$(DotNetBuildFromSource)' != 'true'"
/>
<PackageReference
Include=
"System.Composition"
Version=
"$(SystemCompositionVersion)"
/>
</ItemGroup>
<ItemGroup
Label=
"Linked Files"
>
<Compile
Remove=
"Storage\Sqlite\**\*.cs"
Condition=
"'$(DotNetBuildFromSource)' == 'true'"
/>
<Compile
Include=
"..\..\..\CodeStyle\Core\CodeFixes\FixAllContextHelper.cs"
Link=
"CodeFixes\FixAllOccurrences\FixAllContextHelper.cs"
/>
<Compile
Include=
"..\..\..\Compilers\Shared\DesktopAnalyzerAssemblyLoader.cs"
>
<Link>
Execution\Desktop\DesktopAnalyzerAssemblyLoader.cs
</Link>
...
...
src/Workspaces/Core/Portable/Storage/PersistenceStorageServiceFactory.cs
浏览文件 @
24e3fd5c
...
...
@@ -5,7 +5,10 @@
using
Microsoft.CodeAnalysis.Host.Mef
;
using
Microsoft.CodeAnalysis.Options
;
using
Microsoft.CodeAnalysis.SolutionSize
;
// When building for source-build, there is no sqlite dependency
#if !DOTNET_BUILD_FROM_SOURCE
using
Microsoft.CodeAnalysis.SQLite
;
#endif
namespace
Microsoft.CodeAnalysis.Storage
{
...
...
@@ -22,6 +25,7 @@ public PersistenceStorageServiceFactory(ISolutionSizeTracker solutionSizeTracker
public
IWorkspaceService
CreateService
(
HostWorkspaceServices
workspaceServices
)
{
#if !DOTNET_BUILD_FROM_SOURCE
var
optionService
=
workspaceServices
.
GetRequiredService
<
IOptionService
>();
var
database
=
optionService
.
GetOption
(
StorageOptions
.
Database
);
switch
(
database
)
...
...
@@ -35,6 +39,7 @@ public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
break
;
}
#endif
return
NoOpPersistentStorageService
.
Instance
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录