Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CORE] Dependencies are now moved to Directory.Package.props #6729

Open
wants to merge 45 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
125cde3
[CORE][Akka] Dependencies are now moved to `Directory.Package.props`
eaba May 4, 2023
f6a173c
Merge branch 'dev' into Directory.Package.props
eaba May 4, 2023
ff74505
[CORE][`Akka.API.Tests`] Dependencies are now moved to `Directory.Pac…
eaba May 4, 2023
6aed101
Akka.Cluster.Tests
eaba May 4, 2023
08cf7eb
Akka.Cluster.Tests.MultiNode
eaba May 4, 2023
4275377
Akka.Cluster.Tests.Performance
eaba May 4, 2023
1d974db
Akka.Coordination.Tests
eaba May 4, 2023
4f46a4d
Akka.Discovery.Tests
eaba May 4, 2023
1840f31
Akka.Docs.Tests
eaba May 4, 2023
59479ae
Akka.Docs.Tutorials
eaba May 4, 2023
d1c4fa9
Akka.FSharp
eaba May 4, 2023
b4c39ef
Akka.FSharp.Tests
eaba May 4, 2023
a78e34d
Akka.Persistence
eaba May 4, 2023
507de6d
Akka.Persistence.Query.Tests
eaba May 4, 2023
5442472
Akka.Persistence.TCK
eaba May 4, 2023
a2b8888
Akka.Persistence.TCK.Tests
eaba May 4, 2023
15c8997
Akka.Persistence.TestKit.Tests
eaba May 4, 2023
38ec1be
Akka.Persistence.Tests
eaba May 4, 2023
a84988a
Akka.Remote
eaba May 4, 2023
ce30ae2
Akka.Remote.TestKit
eaba May 4, 2023
536c6ad
Akka.Remote.TestKit.Tests
eaba May 4, 2023
6e5c85d
Akka.Remote.Tests
eaba May 4, 2023
61cfba3
Akka.Remote.Tests.MultiNode
eaba May 4, 2023
b10f5ba
Akka.Remote.Tests.Performance
eaba May 4, 2023
38a56ce
Akka.Streams
eaba May 4, 2023
60d4789
Akka.Streams.TestKit.Tests
eaba May 4, 2023
0968e1d
Akka.Streams.Tests
eaba May 4, 2023
033f6be
Akka.Streams.Tests.Performance
eaba May 4, 2023
41bbbe9
Akka.Streams.Tests.TCK
eaba May 4, 2023
790e692
Akka.TestKit
eaba May 4, 2023
e5db73c
Akka.TestKit.Tests
eaba May 4, 2023
34a8efd
Akka.Tests
eaba May 4, 2023
f992f43
Akka.Tests.Performance
eaba May 4, 2023
c70c350
Akka.Tests.Shared.Internals
eaba May 4, 2023
ad9b282
more improves for `Directory.Build.props`
eaba May 5, 2023
df50540
Merge branch 'dev' into Directory.Package.props
eaba May 5, 2023
77bc827
FSharp.Core
eaba May 5, 2023
1e220d5
Merge branch 'dev' into Directory.Package.props
eaba May 5, 2023
6ccb855
Merge branch 'dev' into Directory.Package.props
eaba May 12, 2023
f6dd578
[Akka.csprop] Removed `PackageReference` Microsoft.SourceLink.GitHub
eaba May 12, 2023
b5e6f52
Add `Directory.Build.targets`
eaba May 13, 2023
49f3f4b
Update NET7.0 to NET7.0.203
eaba May 13, 2023
e52a477
Merge branch 'dev' into Directory.Package.props
eaba May 17, 2023
4feac9b
Merge branch 'dev' into Directory.Package.props
eaba May 17, 2023
5483503
Merge branch 'dev' into Directory.Package.props
eaba May 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.ps1
Expand Up @@ -30,8 +30,8 @@ Param(
)

$FakeVersion = "4.63.0"
$NugetVersion = "5.8.0";
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe"
$NugetVersion = "latest";
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
$ProtobufVersion = "3.21.5"
$DocfxVersion = "2.67.0"

Expand Down
2 changes: 1 addition & 1 deletion build.sh
Expand Up @@ -9,7 +9,7 @@ TOOLS_DIR=$SCRIPT_DIR/tools
INCREMENTALIST_DIR=$TOOLS_DIR/incrementalist
INCREMENTALIST_EXE=$INCREMENTALIST_DIR/Incrementalist.Cmd.exe
NUGET_EXE=$TOOLS_DIR/nuget.exe
NUGET_URL=https://dist.nuget.org/win-x86-commandline/v5.8.0/nuget.exe
NUGET_URL=https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
FAKE_VERSION=4.63.0
FAKE_EXE=$TOOLS_DIR/FAKE/tools/FAKE.exe
DOTNET_EXE=$SCRIPT_DIR/.dotnet/dotnet
Expand Down
11 changes: 11 additions & 0 deletions src/core/Directory.Build.targets
@@ -0,0 +1,11 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Condition=" '$(EnableCentralPackageVersions)' != 'false' ">
<!--
Workaround the issue where FSharp SDK adds implicit PackageReference items but doesn't mark them as such
https://github.com/NuGet/Home/issues/11949
-->
<PackageReference Update="FSharp.Core"
Condition="'$(MSBuildProjectExtension)' == '.fsproj' And '$(DisableImplicitFSharpCoreReference)' != 'true' And '$(UpdateImplicitFSharpCoreReference)' != 'false'"
IsImplicitlyDefined="true" />
</ItemGroup>
</Project>
Copy link
Contributor Author

@eaba eaba May 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added Directory.Build.targets FSharp.Core

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah interesting - this is where the NuGet package duplicate warning error has also come from too I suspect. Nice fix.

1 change: 1 addition & 0 deletions src/core/Directory.Packages.props
@@ -1,6 +1,7 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<!-- App dependencies -->
<ItemGroup>
Expand Down