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

Commit8f4f2ae

Browse files
authored
Merge pull request #4314 from brettfo/dependency-uptake-nuspec
propagate Microsoft.DiaSymReader* version overrides to NuGet packages
2 parents71fcc34 +19dd0df commit8f4f2ae

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

‎src/buildfromsource/FSharp.Compiler.nuget/FSharp.Compiler.nuget.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<PackageTagsCondition="'$(PackageTags)' == ''" >Visual F# Compiler FSharp functional programming</PackageTags>
2222
<PreReleaseSuffixCondition="'$(PreRelease)' != 'false'">-rc-$(BuildRevision.Trim())-0</PreReleaseSuffix>
2323
<PackageVersion>4.2.0$(PreReleaseSuffix)</PackageVersion>
24-
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
24+
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)" -prop "diasymreaderversion=1.1.0" -prop "diasymreaderportablepdbversion=1.2.0"</PackageProperties>
2525
</PropertyGroup>
2626

2727
<PropertyGroup>
2828
<NuspecFile>$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.nuspec</NuspecFile>
29-
<NuspecProperties>licenseUrl=$(PackageLicenceUrl);version=$(PackageVersion);authors=$(PackageAuthors);projectUrl=$(PackageProjectUrl);tags=$(PackageTags)</NuspecProperties>
29+
<NuspecProperties>licenseUrl=$(PackageLicenceUrl);version=$(PackageVersion);authors=$(PackageAuthors);projectUrl=$(PackageProjectUrl);tags=$(PackageTags);diasymreaderversion=1.1.0;diasymreaderportablepdbversion=1.2.0</NuspecProperties>
3030
<NuspecBasePath>$(OutputPath)/$(TargetFramework)</NuspecBasePath>
3131
</PropertyGroup>
3232

‎src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\coreclr\bin</OutputPath>
1616
<PreReleaseSuffixCondition="'$(PreRelease)' != 'false'">-rtm-$(BuildRevision.Trim())-0</PreReleaseSuffix>
1717
<PackageVersion>4.2.0$(PreReleaseSuffix)</PackageVersion>
18-
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
18+
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)" -prop "diasymreaderversion=$(MicrosoftDiaSymReaderPackageVersion)" -prop "diasymreaderportablepdbversion=$(MicrosoftDiaSymReaderPortablePdbPackageVersion)"</PackageProperties>
1919
</PropertyGroup>
2020

2121
<ItemGroupCondition="'$(TargetDotnetProfile)' == 'coreclr'">
@@ -57,7 +57,7 @@
5757
Outputs='$(FSharpSourcesRoot)\$(Configuration)\artifacts\$(PackageVersion)\"%(PackageNuspec.Filename)).nupkg'>
5858

5959
<PropertyGroup>
60-
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
60+
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)" -prop "diasymreaderversion=$(MicrosoftDiaSymReaderPackageVersion)" -prop "diasymreaderportablepdbversion=$(MicrosoftDiaSymReaderPortablePdbPackageVersion)"</PackageProperties>
6161
</PropertyGroup>
6262

6363
<MakeDirDirectories="$(FSharpSourcesRoot)\..\artifacts" />

‎src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<dependencyid="System.Threading.Thread"version="4.0.0" />
3434
<dependencyid="System.Threading.ThreadPool"version="4.0.10" />
3535
<dependencyid="System.ValueTuple"version="4.3.1" />
36-
<dependencyid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
37-
<dependencyid="Microsoft.DiaSymReader"version="1.1.0" />
36+
<dependencyid="Microsoft.DiaSymReader.PortablePdb"version="$diasymreaderportablepdbversion$" />
37+
<dependencyid="Microsoft.DiaSymReader"version="$diasymreaderversion$" />
3838
</group>
3939
</dependencies>
4040
<contentFiles>

‎src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<dependencyid="System.Threading.Thread"version="4.0.0" />
3333
<dependencyid="System.Threading.ThreadPool"version="4.0.10" />
3434
<dependencyid="System.ValueTuple"version="4.3.1" />
35-
<dependencyid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
36-
<dependencyid="Microsoft.DiaSymReader"version="1.1.0" />
35+
<dependencyid="Microsoft.DiaSymReader.PortablePdb"version="$diasymreaderportablepdbversion$" />
36+
<dependencyid="Microsoft.DiaSymReader"version="$diasymreaderversion$" />
3737
</group>
3838
</dependencies>
3939
</metadata>

0 commit comments

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