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.

Sign up for GitHub

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

Jump to bottom

Centralized NuGet Package Management #284

Merged
merged 5 commits into from
Feb 17, 2023
Merged

Centralized NuGet Package Management #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08d5d1a
Centralized NuGet Package Management
eaba Feb 16, 2023
d95e368
replace it `Directory.Build.props`
eaba Feb 16, 2023
db47aa4
[fix] .NET 3.1.100 > .NET 3.1.32
eaba Feb 17, 2023
50ca1bd
.NET 6.0.406
eaba Feb 17, 2023
e09774b
removed `$(NetCoreTestVersion);` Tests
eaba Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>

<packageSources>
<clear/>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>

<packageSourceMapping>
<!-- key value for <packageSource> should match key values from <packageSources> element -->
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
</packageSourceMapping>

</configuration>
4 changes: 2 additions & 2 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ Target "Clean" (fun _ ->
)

Target "AssemblyInfo" (fun _ ->
XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion
XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion
XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
)


Expand Down
2 changes: 1 addition & 1 deletion build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Param(

$FakeVersion = "4.61.2"
$DotNetChannel = "LTS";
$DotNetVersion = "3.1.100";
$DotNetVersion = "6.0.406";
$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
$NugetVersion = "4.1.0";
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe"
Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ NUGET_EXE=$TOOLS_DIR/nuget.exe
NUGET_URL=https://dist.nuget.org/win-x86-commandline/v4.0.0/nuget.exe
FAKE_VERSION=4.61.2
FAKE_EXE=$TOOLS_DIR/FAKE/tools/FAKE.exe
DOTNET_VERSION=3.1.100
DOTNET_VERSION=6.0.406
DOTNET_INSTALLER_URL=https://dot.net/v1/dotnet-install.sh
DOTNET_CHANNEL=LTS;
DOCFX_VERSION=2.49.0
Expand Down
6 changes: 3 additions & 3 deletions src/Akka.Persistence.Azure.Hosting/Akka.Persistence.Azure.Hosting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\common.props" />

<PropertyGroup>
<TargetFramework>$(NetStandardLibVersion)</TargetFramework>
<TargetFrameworks>$(NetStandardLibVersion);$(NetVersion)</TargetFrameworks>
<Description>Akka.Hosting support for Akka.Persistence.Azure.</Description>
<LangVersion>8.0</LangVersion>
</PropertyGroup>
Expand All @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Akka.Persistence.Hosting" Version="1.0.3" />
<PackageReference Include="Akka.Persistence.Hosting" />
</ItemGroup>

</Project>
8 changes: 3 additions & 5 deletions src/Akka.Persistence.Azure.Tests.Performance/Akka.Persistence.Azure.Tests.Performance.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\common.props" />



<PropertyGroup>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<TargetFramework>$(NetCoreTestVersion)</TargetFramework>
<TargetFrameworks>$(NetCoreTestVersion);$(NetVersion)</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NBench" Version="2.0.1" />
<PackageReference Include="NBench" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 6 additions & 7 deletions src/Akka.Persistence.Azure.Tests/Akka.Persistence.Azure.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\common.props" />
<PropertyGroup>
<TargetFramework>$(NetCoreTestVersion)</TargetFramework>
<TargetFrameworks>$(NetVersion)</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Akka.Persistence.TCK" Version="$(AkkaVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
<PackageReference Include="Docker.DotNet" Version="3.125.12" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Akka.Persistence.TCK" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Docker.DotNet" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" >
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
15 changes: 6 additions & 9 deletions src/Akka.Persistence.Azure/Akka.Persistence.Azure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\common.props" />


<PropertyGroup>
<TargetFramework>$(NetStandardLibVersion)</TargetFramework>
<TargetFrameworks>$(NetStandardLibVersion);$(NetVersion)</TargetFrameworks>
<Description>Akka.Persistence support for Windows Azure Table storage and Azure blob storage.</Description>
<LangVersion>8.0</LangVersion>
</PropertyGroup>
Expand All @@ -14,11 +11,11 @@


<ItemGroup>
<PackageReference Include="Akka.Persistence.Query" Version="$(AkkaVersion)" />
<PackageReference Include="Azure.Data.Tables" Version="12.8.0" />
<PackageReference Include="Azure.Identity" Version="1.8.2" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.13.1" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="Akka.Persistence.Query" />
<PackageReference Include="Azure.Data.Tables" />
<PackageReference Include="Azure.Identity" />
<PackageReference Include="Azure.Storage.Blobs" />
<PackageReference Include="System.Linq.Async" />
</ItemGroup>

</Project>
9 changes: 5 additions & 4 deletions src/common.props → src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Copyright>Copyright © 2017-2020 Petabridge</Copyright>
<Copyright>Copyright © 2017-2023 Petabridge</Copyright>
<Authors>Petabridge</Authors>
<VersionPrefix>0.8.4</VersionPrefix>
<PackageReleaseNotes>Upgraded to [Akka.NET 1.4.39](https://github.com/akkadotnet/akka.net/releases/tag/1.4.39)
Expand All @@ -16,12 +16,13 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
</PropertyGroup>
<PropertyGroup>
<XunitVersion>2.4.1</XunitVersion>
<XunitVersion>2.4.2</XunitVersion>
<AkkaVersion>1.4.49</AkkaVersion>
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
<FluentAssertionsVersion>6.10.0</FluentAssertionsVersion>
<TestSdkVersion>17.4.1</TestSdkVersion>
<NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
<NetFrameworkTestVersion>net461</NetFrameworkTestVersion>
<NetVersion>net6.0</NetVersion>
<NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
</PropertyGroup>
<PropertyGroup>
Expand All @@ -34,6 +35,6 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
</ItemGroup>
</Project>
28 changes: 28 additions & 0 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<!-- App dependencies -->
<ItemGroup>
<PackageVersion Include="Akka.Persistence.TCK" Version="$(AkkaVersion)" />
<PackageVersion Include="Docker.DotNet" Version="3.125.12" />
<PackageVersion Include="Akka.Persistence.Query" Version="$(AkkaVersion)" />
<PackageVersion Include="Azure.Data.Tables" Version="12.8.0" />
<PackageVersion Include="Azure.Identity" Version="1.8.2" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.13.1" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="Akka.Persistence.Hosting" Version="1.0.3" />
<PackageVersion Include="NBench" Version="2.0.1" />
</ItemGroup>
<!-- Test dependencies -->
<ItemGroup>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
<PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
</ItemGroup>
<!-- SourceLink support for all Akka.NET projects -->
<ItemGroup>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>

</Project>