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

Commit7090302

Browse files
authored
Merge pull requestdotnet#4674 from brettfo/source-build-package-version
parameterize buildfromsource package versions
2 parents6417ab1 +136e93f commit7090302

File tree

9 files changed

+104
-47
lines changed

9 files changed

+104
-47
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
3+
<ImportProject="targets\PackageVersions.props" />
4+
5+
</Project>

‎src/buildfromsource/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<OutputType>Library</OutputType>
7-
<TargetFramework>netcoreapp1.0</TargetFramework>
7+
<TargetFramework>netstandard2.0</TargetFramework>
88
<AssemblyName>FSharp.Build</AssemblyName>
99
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
1010
<AllowCrossTargeting>true</AllowCrossTargeting>
@@ -55,11 +55,14 @@
5555

5656
<ItemGroup>
5757
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
58-
<PackageReferenceInclude="Microsoft.Build"Version="15.1.548"></PackageReference>
59-
<PackageReferenceInclude="Microsoft.Build.Framework"Version="15.1.548"></PackageReference>
60-
<PackageReferenceInclude="Microsoft.Build.Tasks.Core"Version="15.1.548"></PackageReference>
61-
<PackageReferenceInclude="Microsoft.Build.Utilities.Core"Version="15.1.548"></PackageReference>
62-
<PackageReferenceInclude="Microsoft.Win32.Registry"Version="4.3.0"></PackageReference>
58+
</ItemGroup>
59+
60+
<ItemGroup>
61+
<PackageReferenceInclude="Microsoft.Build"Version="$(MicrosoftBuildPackageVersion)" />
62+
<PackageReferenceInclude="Microsoft.Build.Framework"Version="$(MicrosoftBuildFrameworkPackageVersion)" />
63+
<PackageReferenceInclude="Microsoft.Build.Tasks.Core"Version="$(MicrosoftBuildTasksCorePackageVersion)" />
64+
<PackageReferenceInclude="Microsoft.Build.Utilities.Core"Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
65+
<PackageReferenceInclude="Microsoft.Win32.Registry"Version="$(MicrosoftWin32RegistryPackageVersion)" />
6366
</ItemGroup>
6467

6568
</Project>

‎src/buildfromsource/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@
2525
<CompileInclude="$(FSharpSourcesRoot)\fsharp\fsiaux.fs" />
2626
</ItemGroup>
2727

28-
2928
<ItemGroup>
3029
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
31-
<PackageReferenceInclude="System.Reflection.TypeExtensions"Version="4.3.0"></PackageReference>
30+
</ItemGroup>
31+
32+
<ItemGroup>
33+
<PackageReferenceInclude="System.Reflection.TypeExtensions"Version="$(SystemReflectionTypeExtensionsPackageVersion)" />
3234
</ItemGroup>
3335

3436
</Project>

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

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -619,25 +619,28 @@
619619

620620
<ItemGroup>
621621
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
622-
<PackageReferenceInclude="System.Collections.Immutable"Version="1.3.1"></PackageReference>
623-
<PackageReferenceInclude="System.Diagnostics.Process"Version="4.3.0"></PackageReference>
624-
<PackageReferenceInclude="System.Diagnostics.TraceSource"Version="4.3.0"></PackageReference>
625-
<PackageReferenceInclude="System.Linq.Expressions"Version="4.3.0"></PackageReference>
626-
<PackageReferenceInclude="System.Linq.Queryable"Version="4.3.0"></PackageReference>
627-
<PackageReferenceInclude="System.Net.Requests"Version="4.3.0"></PackageReference>
628-
<PackageReferenceInclude="System.Reflection.Emit"Version="4.3.0"></PackageReference>
629-
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.4.2"></PackageReference>
630-
<PackageReferenceInclude="System.Reflection.TypeExtensions"Version="4.3.0"></PackageReference>
631-
<PackageReferenceInclude="System.Runtime"Version="4.3.0"></PackageReference>
632-
<PackageReferenceInclude="System.Runtime.InteropServices"Version="4.3.0"></PackageReference>
633-
<PackageReferenceInclude="System.Runtime.Loader"Version="4.3.0"></PackageReference>
634-
<PackageReferenceInclude="System.Security.Cryptography.Algorithms"Version="4.3.0"></PackageReference>
635-
<PackageReferenceInclude="System.Threading.Tasks.Parallel"Version="4.3.0"></PackageReference>
636-
<PackageReferenceInclude="System.Threading.Thread"Version="4.3.0"></PackageReference>
637-
<PackageReferenceInclude="System.Threading.ThreadPool"Version="4.3.0"></PackageReference>
638-
<PackageReferenceInclude="Microsoft.DiaSymReader.PortablePdb"Version="1.2.0"></PackageReference>
639-
<PackageReferenceInclude="Microsoft.DiaSymReader"Version="1.1.0"></PackageReference>
640-
<PackageReferenceInclude="System.ValueTuple"Version="4.4.0"></PackageReference>
622+
</ItemGroup>
623+
624+
<ItemGroup>
625+
<PackageReferenceInclude="System.Collections.Immutable"Version="$(SystemCollectionsImmutablePackageVersion)" />
626+
<PackageReferenceInclude="System.Diagnostics.Process"Version="$(SystemDiagnosticsProcessPackageVersion)" />
627+
<PackageReferenceInclude="System.Diagnostics.TraceSource"Version="$(SystemDiagnosticsTraceSourcePackageVersion)" />
628+
<PackageReferenceInclude="System.Linq.Expressions"Version="$(SystemLinqExpressionsPackageVersion)" />
629+
<PackageReferenceInclude="System.Linq.Queryable"Version="$(SystemLinqExpressionsPackageVersion)" />
630+
<PackageReferenceInclude="System.Net.Requests"Version="$(SystemNetRequestsPackageVersion)" />
631+
<PackageReferenceInclude="System.Reflection.Emit"Version="$(SystemReflectionEmitPackageVersion)" />
632+
<PackageReferenceInclude="System.Reflection.Metadata"Version="$(SystemReflectionMetadataPackageVersion)" />
633+
<PackageReferenceInclude="System.Reflection.TypeExtensions"Version="$(SystemReflectionTypeExtensionsPackageVersion)" />
634+
<PackageReferenceInclude="System.Runtime"Version="$(SystemRuntimePackageVersion)" />
635+
<PackageReferenceInclude="System.Runtime.InteropServices"Version="$(SystemRuntimeInteropServicesPackageVersion)" />
636+
<PackageReferenceInclude="System.Runtime.Loader"Version="$(SystemRuntimeLoaderPackageVersion)" />
637+
<PackageReferenceInclude="System.Security.Cryptography.Algorithms"Version="$(SystemSecurityCryptographyAlgorithmsPackageVersion)" />
638+
<PackageReferenceInclude="System.Threading.Tasks.Parallel"Version="$(SystemThreadingTasksParallelPackageVersion)" />
639+
<PackageReferenceInclude="System.Threading.Thread"Version="$(SystemThreadingThreadPackageVersion)" />
640+
<PackageReferenceInclude="System.Threading.ThreadPool"Version="$(SystemThreadingThreadPoolPackageVersion)" />
641+
<PackageReferenceInclude="Microsoft.DiaSymReader.PortablePdb"Version="$(MicrosoftDiaSymReaderPortablePdbPackageVersion)" />
642+
<PackageReferenceInclude="Microsoft.DiaSymReader"Version="$(MicrosoftDiaSymReaderPackageVersion)" />
643+
<PackageReferenceInclude="System.ValueTuple"Version="$(SystemValueTuplePackageVersion)" />
641644
</ItemGroup>
642645

643646
</Project>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>netcoreapp1.0</TargetFramework>
7+
<TargetFramework>netstandard2.0</TargetFramework>
88
<AssemblyName>Microsoft.FSharp.Compiler</AssemblyName>
99
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
1010
<AllowCrossTargeting>true</AllowCrossTargeting>
@@ -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>10.1.1$(PreReleaseSuffix)</PackageVersion>
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>
24+
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)" -prop "diasymreaderversion=$(MicrosoftDiaSymReaderPackageVersion)" -prop "diasymreaderportablepdbversion=$(MicrosoftDiaSymReaderPortablePdbPackageVersion)"</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);diasymreaderversion=1.1.0;diasymreaderportablepdbversion=1.2.0</NuspecProperties>
29+
<NuspecProperties>licenseUrl=$(PackageLicenceUrl);version=$(PackageVersion);authors=$(PackageAuthors);projectUrl=$(PackageProjectUrl);tags=$(PackageTags);diasymreaderversion=$(MicrosoftDiaSymReaderPackageVersion);diasymreaderportablepdbversion=$(MicrosoftDiaSymReaderPortablePdbPackageVersion)</NuspecProperties>
3030
<NuspecBasePath>$(OutputPath)/$(TargetFramework)</NuspecBasePath>
3131
</PropertyGroup>
3232

‎src/buildfromsource/FSharp.Core/FSharp.Core.fsproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,11 @@
200200
</ItemGroup>
201201

202202
<ItemGroup>
203-
<PackageReferenceInclude="System.Linq.Queryable"Version="4.3.0"></PackageReference>
204-
<PackageReferenceInclude="System.Net.Requests"Version="4.3.0"></PackageReference>
205-
<PackageReferenceInclude="System.Threading.Thread"Version="4.3.0"></PackageReference>
206-
<PackageReferenceInclude="System.Threading.ThreadPool"Version="4.3.0"></PackageReference>
207-
<PackageReferenceInclude="System.Threading.Tasks.Parallel"Version="4.3.0"></PackageReference>
203+
<PackageReferenceInclude="System.Linq.Queryable"Version="$(SystemLinqQueryablePackageVersion)" />
204+
<PackageReferenceInclude="System.Net.Requests"Version="$(SystemNetRequestsPackageVersion)" />
205+
<PackageReferenceInclude="System.Threading.Thread"Version="$(SystemThreadingThreadPackageVersion)" />
206+
<PackageReferenceInclude="System.Threading.ThreadPool"Version="$(SystemThreadingThreadPoolPackageVersion)" />
207+
<PackageReferenceInclude="System.Threading.Tasks.Parallel"Version="$(SystemThreadingTasksParallelPackageVersion)" />
208208
</ItemGroup>
209209

210210
<!-- Hook compilation phase to do custom work-->

‎src/buildfromsource/Fsc/Fsc.fsproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>netcoreapp1.0</TargetFramework>
7+
<TargetFramework>netstandard2.0</TargetFramework>
88
<TargetExt>.exe</TargetExt>
99
<AssemblyName>fsc</AssemblyName>
1010
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
@@ -31,9 +31,12 @@
3131
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
3232
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Build\FSharp.Build.fsproj" />
3333
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
34-
<PackageReferenceInclude="System.Linq.Expressions"Version="4.3.0"></PackageReference>
35-
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.4.2"></PackageReference>
36-
<PackageReferenceInclude="System.Runtime.Loader"Version="4.3.0"></PackageReference>
34+
</ItemGroup>
35+
36+
<ItemGroup>
37+
<PackageReferenceInclude="System.Linq.Expressions"Version="$(SystemLinqExpressionsPackageVersion)" />
38+
<PackageReferenceInclude="System.Reflection.Metadata"Version="$(SystemReflectionMetadataPackageVersion)" />
39+
<PackageReferenceInclude="System.Runtime.Loader"Version="$(SystemRuntimeLoaderPackageVersion)" />
3740
</ItemGroup>
3841

3942
</Project>

‎src/buildfromsource/Fsi/Fsi.fsproj‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>netcoreapp1.0</TargetFramework>
7+
<TargetFramework>netstandard2.0</TargetFramework>
88
<TargetExt>.exe</TargetExt>
99
<AssemblyName>fsi</AssemblyName>
1010
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
@@ -35,13 +35,16 @@
3535
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
3636
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
3737
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
38-
<PackageReferenceInclude="System.Diagnostics.Process"Version="4.3.0"></PackageReference>
39-
<PackageReferenceInclude="System.Linq.Expressions"Version="4.3.0"></PackageReference>
40-
<PackageReferenceInclude="System.Reflection.Emit"Version="4.3.0"></PackageReference>
41-
<PackageReferenceInclude="System.Reflection.TypeExtensions"Version="4.3.0"></PackageReference>
42-
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.4.2"></PackageReference>
43-
<PackageReferenceInclude="System.Runtime.Loader"Version="4.3.0"></PackageReference>
44-
<PackageReferenceInclude="System.Threading.Thread"Version="4.3.0"></PackageReference>
38+
</ItemGroup>
39+
40+
<ItemGroup>
41+
<PackageReferenceInclude="System.Diagnostics.Process"Version="$(SystemDiagnosticsProcessPackageVersion)" />
42+
<PackageReferenceInclude="System.Linq.Expressions"Version="$(SystemLinqExpressionsPackageVersion)" />
43+
<PackageReferenceInclude="System.Reflection.Emit"Version="$(SystemReflectionEmitPackageVersion)" />
44+
<PackageReferenceInclude="System.Reflection.TypeExtensions"Version="$(SystemReflectionTypeExtensionsPackageVersion)" />
45+
<PackageReferenceInclude="System.Reflection.Metadata"Version="$(SystemReflectionMetadataPackageVersion)" />
46+
<PackageReferenceInclude="System.Runtime.Loader"Version="$(SystemRuntimeLoaderPackageVersion)" />
47+
<PackageReferenceInclude="System.Threading.Thread"Version="$(SystemThreadingThreadPackageVersion)" />
4548
</ItemGroup>
4649

4750
</Project>
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
5+
<!-- System.* packages-->
6+
<SystemCollectionsImmutablePackageVersion>1.3.1</SystemCollectionsImmutablePackageVersion>
7+
<SystemDiagnosticsProcessPackageVersion>4.3.0</SystemDiagnosticsProcessPackageVersion>
8+
<SystemDiagnosticsTraceSourcePackageVersion>4.3.0</SystemDiagnosticsTraceSourcePackageVersion>
9+
<SystemLinqExpressionsPackageVersion>4.3.0</SystemLinqExpressionsPackageVersion>
10+
<SystemLinqQueryablePackageVersion>4.3.0</SystemLinqQueryablePackageVersion>
11+
<SystemNetRequestsPackageVersion>4.3.0</SystemNetRequestsPackageVersion>
12+
<SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion>
13+
<SystemReflectionMetadataPackageVersion>1.4.2</SystemReflectionMetadataPackageVersion>
14+
<SystemReflectionTypeExtensionsPackageVersion>4.3.0</SystemReflectionTypeExtensionsPackageVersion>
15+
<SystemRuntimePackageVersion>4.3.0</SystemRuntimePackageVersion>
16+
<SystemRuntimeInteropServicesPackageVersion>4.3.0</SystemRuntimeInteropServicesPackageVersion>
17+
<SystemRuntimeLoaderPackageVersion>4.3.0</SystemRuntimeLoaderPackageVersion>
18+
<SystemSecurityCryptographyAlgorithmsPackageVersion>4.3.0</SystemSecurityCryptographyAlgorithmsPackageVersion>
19+
<SystemThreadingTasksParallelPackageVersion>4.3.0</SystemThreadingTasksParallelPackageVersion>
20+
<SystemThreadingThreadPackageVersion>4.3.0</SystemThreadingThreadPackageVersion>
21+
<SystemThreadingThreadPoolPackageVersion>4.3.0</SystemThreadingThreadPoolPackageVersion>
22+
<SystemValueTuplePackageVersion>4.4.0</SystemValueTuplePackageVersion>
23+
24+
<!-- other packages-->
25+
<MicrosoftBuildPackageVersion>15.1.548</MicrosoftBuildPackageVersion>
26+
<MicrosoftBuildFrameworkPackageVersion>15.1.548</MicrosoftBuildFrameworkPackageVersion>
27+
<MicrosoftBuildTasksCorePackageVersion>15.1.548</MicrosoftBuildTasksCorePackageVersion>
28+
<MicrosoftBuildUtilitiesCorePackageVersion>15.1.548</MicrosoftBuildUtilitiesCorePackageVersion>
29+
<MicrosoftDiaSymReaderPackageVersion>1.1.0</MicrosoftDiaSymReaderPackageVersion>
30+
<MicrosoftDiaSymReaderPortablePdbPackageVersion>1.2.0</MicrosoftDiaSymReaderPortablePdbPackageVersion>
31+
<MicrosoftWin32RegistryPackageVersion>4.3.0</MicrosoftWin32RegistryPackageVersion>
32+
33+
</PropertyGroup>
34+
35+
<!-- dependency uptake version overrides-->
36+
<ImportProject="$(DotNetPackageVersionPropsPath)"Condition="'$(DotNetPackageVersionPropsPath)' != '' AND Exists('$(DotNetPackageVersionPropsPath)')" />
37+
38+
</Project>

0 commit comments

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