Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
b9d49424
F
fsharp
项目概览
dotNET Platform
/
fsharp
12 个月 前同步成功
通知
0
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
fsharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b9d49424
编写于
2月 02, 2018
作者:
B
Brett V. Forsgren
提交者:
GitHub
2月 02, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4299 from brettfo/dependency-uptake
enable Microsoft.DiaSymReader* packages to be overridden during build
上级
ecb833c4
8bfe56ec
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
81 addition
and
2 deletion
+81
-2
build.cmd
build.cmd
+21
-0
build.sh
build.sh
+16
-0
build/projects/PrepareDependencyUptake.proj
build/projects/PrepareDependencyUptake.proj
+35
-0
src/FSharpSource.Settings.targets
src/FSharpSource.Settings.targets
+7
-0
src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
...rp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+2
-2
未找到文件。
build.cmd
浏览文件 @
b9d49424
...
...
@@ -603,6 +603,27 @@ if "%RestorePackages%" == "true" (
)
)
echo ----------- Done with package restore, starting dependency uptake check -------------
if not "
%PB_PackageVersionPropsUrl%
" == "" (
set dependencyUptakeDir=
%~dp0
Tools\dependencyUptake
if not exist "
!dependencyUptakeDir!
" mkdir "
!dependencyUptakeDir!
"
:: download package version overrides
echo powershell -noprofile -executionPolicy RemoteSigned -command "
Invoke
-WebRequest -Uri
'
%PB_PackageVersionPropsUrl%
'
-OutFile
'
!dependencyUptakeDir!
\PackageVersions.props'
"
powershell -noprofile -executionPolicy RemoteSigned -command "
Invoke
-WebRequest -Uri
'
%PB_PackageVersionPropsUrl%
'
-OutFile
'
!dependencyUptakeDir!
\PackageVersions.props'
"
if ERRORLEVEL 1 echo Error downloading package version properties && goto :failure
:: prepare dependency uptake files
echo
%_msbuildexe%
%msbuildflags%
%~dp0
build\projects\PrepareDependencyUptake.proj /t:Build
%_msbuildexe%
%msbuildflags%
%~dp0
build\projects\PrepareDependencyUptake.proj /t:Build
if ERRORLEVEL 1 echo Error building dependency uptake files && goto :failure
:: restore dependencies
%_nugetexe%
restore
!dependencyUptakeDir!
\packages.config -PackagesDirectory packages -ConfigFile
!dependencyUptakeDir!
\NuGet.config
if ERRORLEVEL 1 echo Error restoring dependency uptake packages && goto :failure
)
if "
%BUILD_PROTO_WITH_CORECLR_LKG%
" == "
1
" (
:: Restore the Tools directory
call
%~dp0
init-tools.cmd
...
...
build.sh
浏览文件 @
b9d49424
...
...
@@ -333,6 +333,22 @@ fi
# TODO: Check for existence of fsi (either on the system, or from the FSharp.Compiler.Tools package that was restored).
build_status
"Done with package restore, starting dependency uptake check"
if
[
"
$PB_PACKAGEVERSIONPROPSURL
"
!=
""
]
;
then
dependencyUptakeDir
=
"
${
_scriptdir
}
Tools/dependencyUptake"
mkdir
-p
"
$dependencyUptakeDir
"
# download package version overrides
{
printeval
"curl '
$PB_PACKAGEVERSIONPROPSURL
' -o '
$dependencyUptakeDir
/PackageVersions.props'"
;
}
||
failwith
"downloading package version properties failed"
# prepare dependency uptake files
{
printeval
"
$_msbuildexe
$msbuildflags
${
scriptdir
}
build/projects/PrepareDependencyUptake.proj /t:Build"
;
}
||
failwith
"building dependency uptake files failed"
# restore dependencies
{
printeval
"
$_nugetexe
restore '
$dependencyUptakeDir
/packages.config' -PackagesDirectory packages -ConfigFile '
$dependencyUptakeDir
/NuGet.config'"
;
}
||
failwith
"restoring dependency uptake packages failed"
fi
build_status
"Done with package restore, starting proto"
# Decide if Proto need building
...
...
build/projects/PrepareDependencyUptake.proj
0 → 100644
浏览文件 @
b9d49424
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<DependencyUptakeDirectory>$(MSBuildThisFileDirectory)..\..\Tools\dependencyUptake</DependencyUptakeDirectory>
<PackageVersionsPropsFile>$(DependencyUptakeDirectory)\PackageVersions.props</PackageVersionsPropsFile>
<PackagesConfigFile>$(DependencyUptakeDirectory)\packages.config</PackagesConfigFile>
<NuGetConfigFile>$(DependencyUptakeDirectory)\NuGet.config</NuGetConfigFile>
</PropertyGroup>
<Import Project="$(PackageVersionsPropsFile)" />
<!-- Prepare a dummy packages.config -->
<ItemGroup>
<PackagesConfigLines Include="<packages>" />
<PackagesConfigLines Include=" <package id="Microsoft.DiaSymReader" version="$(MicrosoftDiaSymReaderPackageVersion)" />" />
<PackagesConfigLines Include=" <package id="Microsoft.DiaSymReader.PortablePdb" version="$(MicrosoftDiaSymReaderPortablePdbPackageVersion)" />" />
<PackagesConfigLines Include="</packages>" />
</ItemGroup>
<!-- Prepare a dummy NuGet.config -->
<ItemGroup>
<NuGetConfigLines Include="<configuration>" />
<NuGetConfigLines Include=" <packageSources>" />
<NuGetConfigLines Include=" <clear />" />
<NuGetConfigLines Include=" <add key="dependency-uptake" value="$(PB_RestoreSource)" />" />
<NuGetConfigLines Include=" </packageSources>" />
<NuGetConfigLines Include="</configuration>" />
</ItemGroup>
<Target Name="Build">
<WriteLinesToFile File="$(PackagesConfigFile)" Lines="@(PackagesConfigLines)" Overwrite="true" />
<WriteLinesToFile File="$(NuGetConfigFile)" Lines="@(NuGetConfigLines)" Overwrite="true" />
</Target>
</Project>
src/FSharpSource.Settings.targets
浏览文件 @
b9d49424
...
...
@@ -84,6 +84,9 @@
<MicrosoftVisualStudioThreadingVersion>
15.3.23
</MicrosoftVisualStudioThreadingVersion>
<MicrosoftVisualStudioValidationVersion>
15.3.15
</MicrosoftVisualStudioValidationVersion>
<MicrosoftDiaSymReaderPackageVersion>
1.1.0
</MicrosoftDiaSymReaderPackageVersion>
<MicrosoftDiaSymReaderPortablePdbPackageVersion>
1.2.0
</MicrosoftDiaSymReaderPortablePdbPackageVersion>
<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists -->
<IntermediateOutputPath>
obj\$(Configuration)\$(TargetDotnetProfile)\
</IntermediateOutputPath>
<IntermediateOutputPath
Condition=
"'$(PortableProfileBeingReferenced)' != ''"
>
obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\
</IntermediateOutputPath>
...
...
@@ -100,6 +103,8 @@
<MonoPackaging
Condition=
"'$(TargetDotnetProfile)' != 'coreclr' AND '$(OS)' == 'Unix'"
>
true
</MonoPackaging>
<DependencyUptakePackageVersionPropsFile>
$(MSBuildThisFileDirectory)..\Tools\dependencyUptake\PackageVersions.props
</DependencyUptakePackageVersionPropsFile>
<!-- Localization -->
<DisableLocalization
Condition=
"'$(MonoPackaging)' == 'true'"
>
true
</DisableLocalization>
<UpdateXlfOnBuild
Condition=
"'$(CI)' != '1'"
>
true
</UpdateXlfOnBuild>
...
...
@@ -107,6 +112,8 @@
</PropertyGroup>
<Import
Project=
"$(DependencyUptakePackageVersionPropsFile)"
Condition=
"Exists('$(DependencyUptakePackageVersionPropsFile)')"
/>
<!-- Default setting. Some get modified later in FSharpSource.targets -->
<PropertyGroup>
<SkipSigning>
false
</SkipSigning>
...
...
src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
浏览文件 @
b9d49424
...
...
@@ -669,10 +669,10 @@
<Reference
Include=
"System.Numerics"
/>
<Reference
Include=
"ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
/>
<Reference
Include=
"Microsoft.DiaSymReader.PortablePdb"
>
<HintPath>
..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.
1.2.0\lib\portable-net45+win8
\Microsoft.DiaSymReader.PortablePdb.dll
</HintPath>
<HintPath>
..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.
$(MicrosoftDiaSymReaderPortablePdbPackageVersion)\lib\netstandard1.1
\Microsoft.DiaSymReader.PortablePdb.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.DiaSymReader"
>
<HintPath>
..\..\..\packages\Microsoft.DiaSymReader.
1.1.0\lib\portable-net45+win8
\Microsoft.DiaSymReader.dll
</HintPath>
<HintPath>
..\..\..\packages\Microsoft.DiaSymReader.
$(MicrosoftDiaSymReaderPackageVersion)\lib\netstandard1.1
\Microsoft.DiaSymReader.dll
</HintPath>
</Reference>
<Reference
Include=
"System.Reflection.Metadata"
>
<HintPath>
..\..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll
</HintPath>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录