Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
3cb0b52d
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,发现更多精彩内容 >>
提交
3cb0b52d
编写于
3月 22, 2017
作者:
C
CyrusNajmabadi
提交者:
GitHub
3月 22, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18048 from dotnet/merges/dev15.0.x-to-dev15.1.x-20170322-070001
Merge dev15.0.x to dev15.1.x
上级
ba9c82a8
0449c8c4
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
31 addition
and
10 deletion
+31
-10
build/Targets/Dependencies.props
build/Targets/Dependencies.props
+1
-1
src/NuGet/BuildNuGets.csx
src/NuGet/BuildNuGets.csx
+25
-2
src/NuGet/NuGet.proj
src/NuGet/NuGet.proj
+3
-3
src/Setup/DevDivPackages/Roslyn/project.json
src/Setup/DevDivPackages/Roslyn/project.json
+1
-1
src/VisualStudio/Core/Def/project.json
src/VisualStudio/Core/Def/project.json
+0
-1
src/Workspaces/Core/Desktop/project.json
src/Workspaces/Core/Desktop/project.json
+1
-1
src/Workspaces/CoreTest/project.json
src/Workspaces/CoreTest/project.json
+0
-1
未找到文件。
build/Targets/Dependencies.props
浏览文件 @
3cb0b52d
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<MicrosoftBuildTasksCoreVersion>
15.1.0-preview-000458-02
</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildTasksCoreVersion>
15.1.0-preview-000458-02
</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildTasksCore14Version>
14.3.0
</MicrosoftBuildTasksCore14Version>
<MicrosoftBuildTasksCore14Version>
14.3.0
</MicrosoftBuildTasksCore14Version>
<MicrosoftCodeAnalysisAnalyzersVersion>
1.1.0
</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisAnalyzersVersion>
1.1.0
</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisElfieVersion>
0.10.6
-rc2
</MicrosoftCodeAnalysisElfieVersion>
<MicrosoftCodeAnalysisElfieVersion>
0.10.6
</MicrosoftCodeAnalysisElfieVersion>
<MicrosoftCompositionVersion>
1.0.27
</MicrosoftCompositionVersion>
<MicrosoftCompositionVersion>
1.0.27
</MicrosoftCompositionVersion>
<MicrosoftCSharpVersion>
4.3.0
</MicrosoftCSharpVersion>
<MicrosoftCSharpVersion>
4.3.0
</MicrosoftCSharpVersion>
<MicrosoftDiagnosticsRuntimeVersion>
0.8.31-beta
</MicrosoftDiagnosticsRuntimeVersion>
<MicrosoftDiagnosticsRuntimeVersion>
0.8.31-beta
</MicrosoftDiagnosticsRuntimeVersion>
...
...
src/NuGet/BuildNuGets.csx
浏览文件 @
3cb0b52d
...
@@ -129,6 +129,7 @@ var PreReleaseOnlyPackages = new HashSet<string>
...
@@ -129,6 +129,7 @@ var PreReleaseOnlyPackages = new HashSet<string>
"Microsoft.CodeAnalysis.Remote.ServiceHub",
"Microsoft.CodeAnalysis.Remote.ServiceHub",
"Microsoft.CodeAnalysis.Remote.Workspaces",
"Microsoft.CodeAnalysis.Remote.Workspaces",
"Microsoft.CodeAnalysis.Test.Resources.Proprietary",
"Microsoft.CodeAnalysis.Test.Resources.Proprietary",
"Microsoft.VisualStudio.IntegrationTest.Utilities",
"Microsoft.VisualStudio.LanguageServices.Next",
"Microsoft.VisualStudio.LanguageServices.Next",
"Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient",
"Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient",
};
};
...
@@ -171,6 +172,26 @@ void ReportError(string message)
...
@@ -171,6 +172,26 @@ void ReportError(string message)
Console.ForegroundColor = color;
Console.ForegroundColor = color;
}
}
string GetPackageVersion(string packageName)
{
// HACK: since Microsoft.Net.Compilers 2.0.0 was uploaded by accident and later deleted, we must bump the minor.
// We will do this to both the regular Microsoft.Net.Compilers package and also the netcore package to keep them
// in sync.
if (BuildVersion.StartsWith("2.0.") && packageName.StartsWith("Microsoft.Net.Compilers", StringComparison.OrdinalIgnoreCase))
{
string[] buildVersionParts = BuildVersion.Split('-');
string[] buildVersionBaseParts = buildVersionParts[0].Split('.');
buildVersionBaseParts[buildVersionBaseParts.Length - 1] =
(int.Parse(buildVersionBaseParts[buildVersionBaseParts.Length - 1]) + 1).ToString();
buildVersionParts[0] = string.Join(".", buildVersionBaseParts);
return string.Join("-", buildVersionParts);
}
return BuildVersion;
}
int PackFiles(string[] nuspecFiles, string licenseUrl)
int PackFiles(string[] nuspecFiles, string licenseUrl)
{
{
var commonProperties = new Dictionary<string, string>()
var commonProperties = new Dictionary<string, string>()
...
@@ -212,8 +233,10 @@ int PackFiles(string[] nuspecFiles, string licenseUrl)
...
@@ -212,8 +233,10 @@ int PackFiles(string[] nuspecFiles, string licenseUrl)
if (!IsCoreBuild)
if (!IsCoreBuild)
{
{
string packageArgs = commonArgs.Replace($"-prop version=\"{BuildVersion}\"", $"-prop version=\"{GetPackageVersion(Path.GetFileNameWithoutExtension(file))}\"");
p.StartInfo.FileName = Path.GetFullPath(Path.Combine(SolutionRoot, "nuget.exe"));
p.StartInfo.FileName = Path.GetFullPath(Path.Combine(SolutionRoot, "nuget.exe"));
p.StartInfo.Arguments = $@"pack {file} {
common
Args}";
p.StartInfo.Arguments = $@"pack {file} {
package
Args}";
}
}
else
else
{
{
...
@@ -266,7 +289,7 @@ XElement MakePackageElement(string packageName, string version)
...
@@ -266,7 +289,7 @@ XElement MakePackageElement(string packageName, string version)
IEnumerable<XElement> MakeRoslynPackageElements(string[] roslynPackageNames)
IEnumerable<XElement> MakeRoslynPackageElements(string[] roslynPackageNames)
{
{
return roslynPackageNames.Select(packageName => MakePackageElement(packageName,
BuildVersion
));
return roslynPackageNames.Select(packageName => MakePackageElement(packageName,
GetPackageVersion(packageName)
));
}
}
void GeneratePublishingConfig(string fileName, IEnumerable<XElement> packages)
void GeneratePublishingConfig(string fileName, IEnumerable<XElement> packages)
...
...
src/NuGet/NuGet.proj
浏览文件 @
3cb0b52d
...
@@ -15,9 +15,9 @@
...
@@ -15,9 +15,9 @@
</Target>
</Target>
<Target
Name=
"Clean"
>
<Target
Name=
"Clean"
>
<
MSBuild
Projects=
"@(Project)"
Targets=
"Clean"
BuildInParallel=
"false
"
/>
<
RemoveDir
Directories=
"$(OutDir)NuGet
"
/>
</Target>
</Target>
<Target
Name=
"Rebuild"
>
<MSBuild
Projects=
"@(Project)"
Targets=
"Rebuild"
BuildInParallel=
"false"
/
>
<Target
Name=
"Rebuild"
DependsOnTargets=
"Clean;Build"
>
</Target>
</Target>
</Project>
</Project>
\ No newline at end of file
src/Setup/DevDivPackages/Roslyn/project.json
浏览文件 @
3cb0b52d
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
"dependencies"
:
{
"dependencies"
:
{
"Microsoft.DiaSymReader"
:
"1.1.0"
,
"Microsoft.DiaSymReader"
:
"1.1.0"
,
"Microsoft.DiaSymReader.Native"
:
"1.5.0-beta1"
,
"Microsoft.DiaSymReader.Native"
:
"1.5.0-beta1"
,
"Microsoft.CodeAnalysis.Elfie"
:
"0.10.6
-rc2
"
,
"Microsoft.CodeAnalysis.Elfie"
:
"0.10.6"
,
"System.Collections.Immutable"
:
"1.3.1"
,
"System.Collections.Immutable"
:
"1.3.1"
,
"System.Reflection.Metadata"
:
"1.4.2"
,
"System.Reflection.Metadata"
:
"1.4.2"
,
"ManagedEsent"
:
"1.9.4"
,
"ManagedEsent"
:
"1.9.4"
,
...
...
src/VisualStudio/Core/Def/project.json
浏览文件 @
3cb0b52d
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
"EnvDTE"
:
"8.0.0"
,
"EnvDTE"
:
"8.0.0"
,
"EnvDTE80"
:
"8.0.0"
,
"EnvDTE80"
:
"8.0.0"
,
"ManagedEsent"
:
"1.9.4"
,
"ManagedEsent"
:
"1.9.4"
,
"Microsoft.CodeAnalysis.Elfie"
:
"0.10.6-rc2"
,
"Microsoft.VisualStudio.Telemetry"
:
"15.0.722-masterBFDFE2B0"
,
"Microsoft.VisualStudio.Telemetry"
:
"15.0.722-masterBFDFE2B0"
,
"Microsoft.VisualStudio.RemoteControl"
:
"14.0.249-master2E2DC10C"
,
"Microsoft.VisualStudio.RemoteControl"
:
"14.0.249-master2E2DC10C"
,
"Microsoft.VisualStudio.OLE.Interop"
:
"7.10.6070"
,
"Microsoft.VisualStudio.OLE.Interop"
:
"7.10.6070"
,
...
...
src/Workspaces/Core/Desktop/project.json
浏览文件 @
3cb0b52d
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
"ManagedEsent"
:
"1.9.4"
,
"ManagedEsent"
:
"1.9.4"
,
"Microsoft.Build"
:
"15.1.0-preview-000458-02"
,
"Microsoft.Build"
:
"15.1.0-preview-000458-02"
,
"Microsoft.Build.Tasks.Core"
:
"15.1.0-preview-000458-02"
,
"Microsoft.Build.Tasks.Core"
:
"15.1.0-preview-000458-02"
,
"Microsoft.CodeAnalysis.Elfie"
:
"0.10.6
-rc2
"
,
"Microsoft.CodeAnalysis.Elfie"
:
"0.10.6"
,
"Microsoft.VisualStudio.RemoteControl"
:
"14.0.249-master2E2DC10C"
"Microsoft.VisualStudio.RemoteControl"
:
"14.0.249-master2E2DC10C"
},
},
"frameworks"
:
{
"frameworks"
:
{
...
...
src/Workspaces/CoreTest/project.json
浏览文件 @
3cb0b52d
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
"xunit"
:
"2.2.0-beta4-build3444"
,
"xunit"
:
"2.2.0-beta4-build3444"
,
"xunit.runner.console"
:
"2.2.0-beta4-build3444"
,
"xunit.runner.console"
:
"2.2.0-beta4-build3444"
,
"xunit.runner.visualstudio"
:
"2.2.0-beta4-build1194"
,
"xunit.runner.visualstudio"
:
"2.2.0-beta4-build1194"
,
"Microsoft.CodeAnalysis.Elfie"
:
"0.10.6-rc2"
,
"Microsoft.Tpl.Dataflow"
:
"4.5.24"
,
"Microsoft.Tpl.Dataflow"
:
"4.5.24"
,
"Microsoft.Build.Runtime"
:
"15.1.0-preview-000458-02"
,
"Microsoft.Build.Runtime"
:
"15.1.0-preview-000458-02"
,
},
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录