Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb9d4942

Browse files
authored
Merge pull request #4299 from brettfo/dependency-uptake
enable Microsoft.DiaSymReader* packages to be overridden during build
2 parentsecb833c +8bfe56e commitb9d4942

File tree

5 files changed

+81
-2
lines changed

5 files changed

+81
-2
lines changed

‎build.cmd‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,27 @@ if "%RestorePackages%" == "true" (
603603
)
604604
)
605605

606+
echo ----------- Done with package restore, starting dependency uptake check -------------
607+
608+
ifnot"%PB_PackageVersionPropsUrl%"=="" (
609+
setdependencyUptakeDir=%~dp0Tools\dependencyUptake
610+
ifnotexist"!dependencyUptakeDir!"mkdir"!dependencyUptakeDir!"
611+
612+
:: download package version overrides
613+
echo powershell -noprofile -executionPolicy RemoteSigned -command"Invoke-WebRequest -Uri '%PB_PackageVersionPropsUrl%' -OutFile '!dependencyUptakeDir!\PackageVersions.props'"
614+
powershell -noprofile -executionPolicy RemoteSigned -command"Invoke-WebRequest -Uri '%PB_PackageVersionPropsUrl%' -OutFile '!dependencyUptakeDir!\PackageVersions.props'"
615+
ifERRORLEVEL1echo Error downloading package version properties&&goto :failure
616+
617+
:: prepare dependency uptake files
618+
echo%_msbuildexe%%msbuildflags%%~dp0build\projects\PrepareDependencyUptake.proj /t:Build
619+
%_msbuildexe%%msbuildflags%%~dp0build\projects\PrepareDependencyUptake.proj /t:Build
620+
ifERRORLEVEL1echo Error building dependency uptake files&&goto :failure
621+
622+
:: restore dependencies
623+
%_nugetexe% restore!dependencyUptakeDir!\packages.config -PackagesDirectory packages -ConfigFile!dependencyUptakeDir!\NuGet.config
624+
ifERRORLEVEL1echo Error restoring dependency uptake packages&&goto :failure
625+
)
626+
606627
if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="1" (
607628
:: Restore the Tools directory
608629
call%~dp0init-tools.cmd

‎build.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,22 @@ fi
333333

334334
# TODO: Check for existence of fsi (either on the system, or from the FSharp.Compiler.Tools package that was restored).
335335

336+
build_status"Done with package restore, starting dependency uptake check"
337+
338+
if ["$PB_PACKAGEVERSIONPROPSURL"!="" ];then
339+
dependencyUptakeDir="${_scriptdir}Tools/dependencyUptake"
340+
mkdir -p"$dependencyUptakeDir"
341+
342+
# download package version overrides
343+
{ printeval"curl '$PB_PACKAGEVERSIONPROPSURL' -o '$dependencyUptakeDir/PackageVersions.props'"; }|| failwith"downloading package version properties failed"
344+
345+
# prepare dependency uptake files
346+
{ printeval"$_msbuildexe$msbuildflags${scriptdir}build/projects/PrepareDependencyUptake.proj /t:Build"; }|| failwith"building dependency uptake files failed"
347+
348+
# restore dependencies
349+
{ printeval"$_nugetexe restore '$dependencyUptakeDir/packages.config' -PackagesDirectory packages -ConfigFile '$dependencyUptakeDir/NuGet.config'"; }|| failwith"restoring dependency uptake packages failed"
350+
fi
351+
336352
build_status"Done with package restore, starting proto"
337353

338354
# Decide if Proto need building
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<ProjectToolsVersion="14.0"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<PropertyGroup>
4+
<DependencyUptakeDirectory>$(MSBuildThisFileDirectory)..\..\Tools\dependencyUptake</DependencyUptakeDirectory>
5+
<PackageVersionsPropsFile>$(DependencyUptakeDirectory)\PackageVersions.props</PackageVersionsPropsFile>
6+
<PackagesConfigFile>$(DependencyUptakeDirectory)\packages.config</PackagesConfigFile>
7+
<NuGetConfigFile>$(DependencyUptakeDirectory)\NuGet.config</NuGetConfigFile>
8+
</PropertyGroup>
9+
10+
<ImportProject="$(PackageVersionsPropsFile)" />
11+
12+
<!-- Prepare a dummy packages.config-->
13+
<ItemGroup>
14+
<PackagesConfigLinesInclude="&lt;packages&gt;" />
15+
<PackagesConfigLinesInclude="&lt;package id=&quot;Microsoft.DiaSymReader&quot; version=&quot;$(MicrosoftDiaSymReaderPackageVersion)&quot; /&gt;" />
16+
<PackagesConfigLinesInclude="&lt;package id=&quot;Microsoft.DiaSymReader.PortablePdb&quot; version=&quot;$(MicrosoftDiaSymReaderPortablePdbPackageVersion)&quot; /&gt;" />
17+
<PackagesConfigLinesInclude="&lt;/packages&gt;" />
18+
</ItemGroup>
19+
20+
<!-- Prepare a dummy NuGet.config-->
21+
<ItemGroup>
22+
<NuGetConfigLinesInclude="&lt;configuration&gt;" />
23+
<NuGetConfigLinesInclude="&lt;packageSources&gt;" />
24+
<NuGetConfigLinesInclude="&lt;clear /&gt;" />
25+
<NuGetConfigLinesInclude="&lt;add key=&quot;dependency-uptake&quot; value=&quot;$(PB_RestoreSource)&quot; /&gt;" />
26+
<NuGetConfigLinesInclude="&lt;/packageSources&gt;" />
27+
<NuGetConfigLinesInclude="&lt;/configuration&gt;" />
28+
</ItemGroup>
29+
30+
<TargetName="Build">
31+
<WriteLinesToFileFile="$(PackagesConfigFile)"Lines="@(PackagesConfigLines)"Overwrite="true" />
32+
<WriteLinesToFileFile="$(NuGetConfigFile)"Lines="@(NuGetConfigLines)"Overwrite="true" />
33+
</Target>
34+
35+
</Project>

‎src/FSharpSource.Settings.targets‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@
8484
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>
8585
<MicrosoftVisualStudioValidationVersion>15.3.15</MicrosoftVisualStudioValidationVersion>
8686

87+
<MicrosoftDiaSymReaderPackageVersion>1.1.0</MicrosoftDiaSymReaderPackageVersion>
88+
<MicrosoftDiaSymReaderPortablePdbPackageVersion>1.2.0</MicrosoftDiaSymReaderPortablePdbPackageVersion>
89+
8790
<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists-->
8891
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
8992
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
@@ -100,13 +103,17 @@
100103

101104
<MonoPackagingCondition="'$(TargetDotnetProfile)' != 'coreclr' AND '$(OS)' == 'Unix'">true</MonoPackaging>
102105

106+
<DependencyUptakePackageVersionPropsFile>$(MSBuildThisFileDirectory)..\Tools\dependencyUptake\PackageVersions.props</DependencyUptakePackageVersionPropsFile>
107+
103108
<!-- Localization-->
104109
<DisableLocalizationCondition="'$(MonoPackaging)' == 'true'">true</DisableLocalization>
105110
<UpdateXlfOnBuildCondition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
106111
<XliffTasksVersion>0.2.0-beta-000076</XliffTasksVersion>
107112

108113
</PropertyGroup>
109114

115+
<ImportProject="$(DependencyUptakePackageVersionPropsFile)"Condition="Exists('$(DependencyUptakePackageVersionPropsFile)')" />
116+
110117
<!-- Default setting. Some get modified later in FSharpSource.targets-->
111118
<PropertyGroup>
112119
<SkipSigning>false</SkipSigning>

‎src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,10 +669,10 @@
669669
<ReferenceInclude="System.Numerics" />
670670
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
671671
<ReferenceInclude="Microsoft.DiaSymReader.PortablePdb">
672-
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.2.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
672+
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.$(MicrosoftDiaSymReaderPortablePdbPackageVersion)\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
673673
</Reference>
674674
<ReferenceInclude="Microsoft.DiaSymReader">
675-
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath>
675+
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.$(MicrosoftDiaSymReaderPackageVersion)\lib\netstandard1.1\Microsoft.DiaSymReader.dll</HintPath>
676676
</Reference>
677677
<ReferenceInclude="System.Reflection.Metadata">
678678
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp