Skip to content

Relax abstractions version constraints and fix sync workflow version … #647

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

Merged
arcenox merged 1 commit into from
Mar 14, 2026
Merged

Relax abstractions version constraints and fix sync workflow version … #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 19 additions & 6 deletions .github/workflows/sync-version-branches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,19 +222,32 @@ jobs:

# 3. Update Directory.Build.props from main with correct version numbers
if [ -f "src/Directory.Build.props" ]; then
# Save DotNetAbstractionsVersion from target branch before overwriting
target_abstractions_version=$(grep -oP '<DotNetAbstractionsVersion>\K[^<]+' src/Directory.Build.props 2>/dev/null || echo "")

git checkout main -- src/Directory.Build.props

# Version: 10.x.x → {dotnet_ver}.x.x
# Version: e.g. 10.x.x → 8.x.x
current_version=$(grep -oP '<Version>\K[^<]+' src/Directory.Build.props)
new_version=$(echo "$current_version" | sed "s/^10\./$DOTNET_VER./")
new_version=$(echo "$current_version" | sed "s/^[0-9]\+\./$DOTNET_VER./")
sed -i "s|<Version>$current_version</Version>|<Version>$new_version</Version>|g" src/Directory.Build.props

# TargetFramework: net10.0 → net{dotnet_ver}.0
sed -i "s|<TargetFramework>net10\.0</TargetFramework>|<TargetFramework>net${DOTNET_VER}.0</TargetFramework>|g" src/Directory.Build.props
# TargetFramework: e.g. net10.0 → net8.0
sed -i "s|<TargetFramework>net[0-9]\+\.0</TargetFramework>|<TargetFramework>net${DOTNET_VER}.0</TargetFramework>|g" src/Directory.Build.props

# DotNetVersion: [10.0.0,11.0.0) → [{dotnet_ver}.0.0,{dotnet_ver+1}.0.0)
# DotNetVersion: e.g. [10.0.0,11.0.0) → [8.0.0,9.0.0)
next_ver=$((DOTNET_VER + 1))
sed -i "s|<DotNetVersion>\[10\.0\.0,11\.0\.0)</DotNetVersion>|<DotNetVersion>[${DOTNET_VER}.0.0,${next_ver}.0.0)</DotNetVersion>|g" src/Directory.Build.props
sed -i "s|<DotNetVersion>\[[0-9]\+\.0\.0,[0-9]\+\.0\.0)</DotNetVersion>|<DotNetVersion>[${DOTNET_VER}.0.0,${next_ver}.0.0)</DotNetVersion>|g" src/Directory.Build.props

# Preserve DotNetAbstractionsVersion from target branch if it differs
if [ -n "$target_abstractions_version" ]; then
if grep -q '<DotNetAbstractionsVersion>' src/Directory.Build.props; then
sed -i "s|<DotNetAbstractionsVersion>[^<]*</DotNetAbstractionsVersion>|<DotNetAbstractionsVersion>$target_abstractions_version</DotNetAbstractionsVersion>|g" src/Directory.Build.props
else
sed -i "/<DotNetVersion>/a\\ <DotNetAbstractionsVersion>$target_abstractions_version</DotNetAbstractionsVersion>" src/Directory.Build.props
fi
echo " Preserved DotNetAbstractionsVersion: $target_abstractions_version"
fi

echo " Updated Directory.Build.props: Version=$new_version, TF=net${DOTNET_VER}.0, DotNetVersion=[${DOTNET_VER}.0.0,${next_ver}.0.0)"
fi
Expand Down
1 change: 1 addition & 0 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>10.1.1</Version>
<DotNetVersion>[10.0.0,11.0.0)</DotNetVersion>
<DotNetAbstractionsVersion>[8.0.0,)</DotNetAbstractionsVersion>
<LangVersion>default</LangVersion>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/TickerQ.Instrumentation.OpenTelemetry/TickerQ.Instrumentation.OpenTelemetry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="[1.7.0,)" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="[1.7.0,)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNetVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(DotNetVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNetAbstractionsVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(DotNetAbstractionsVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/TickerQ.Utilities/TickerQ.Utilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(DotNetVersion)" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(DotNetVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(DotNetVersion)" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(DotNetVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNetVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(DotNetAbstractionsVersion)" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(DotNetAbstractionsVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(DotNetAbstractionsVersion)" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(DotNetAbstractionsVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNetAbstractionsVersion)" />
<PackageReference Include="NCrontab" Version="[3.3.0,)" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/TickerQ/TickerQ.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="TickerQ.Utilities" Version="$(Version)" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(DotNetVersion)" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(DotNetAbstractionsVersion)" />
</ItemGroup>

<Target Name="CopyAnalyzer" AfterTargets="Build">
Expand Down
Loading