Skip to content

Fix S.R.CS.Unsafe AssemblyVersion and move properties to Versioning.props #221

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
merged 4 commits into from
Apr 3, 2025
Merged

Fix S.R.CS.Unsafe AssemblyVersion and move properties to Versioning.props #221

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f358447
Fix S.R.CS.Unsafe AssemblYVersion and move properties to Versioning.p…
carlossanlop Apr 2, 2025
07fee0a
Enable additional packages which depend on S.R.CS.Unsafe
ericstj Apr 3, 2025
0578767
Reset IsPackable to false
ViktorHofer Apr 3, 2025
b7e1f77
Revert commit
ViktorHofer Apr 3, 2025
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
2 changes: 1 addition & 1 deletion src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!-- Package servicing properties -->
<PropertyGroup>
<IsPackable>false</IsPackable>
<IsPackable>true</IsPackable>
<VersionPrefix>6.1.2</VersionPrefix>
<VersionPrefix Condition="'$(IsPackable)' == 'true'">6.1.3</VersionPrefix>
<PackageValidationBaselineVersion>6.1.2</PackageValidationBaselineVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/System.Memory/src/System.Memory.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- Package servicing properties -->
<PropertyGroup>
<IsPackable>false</IsPackable>
<IsPackable>true</IsPackable>
<VersionPrefix>4.6.2</VersionPrefix>
<VersionPrefix Condition="'$(IsPackable)' == 'true'">4.6.3</VersionPrefix>
<AssemblyVersion Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">4.0.4.0</AssemblyVersion>
Expand Down
2 changes: 1 addition & 1 deletion ...ystem.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<!-- Package servicing properties -->
<PropertyGroup>
<IsPackable>false</IsPackable>
<IsPackable>true</IsPackable>
<VersionPrefix>5.1.2</VersionPrefix>
<VersionPrefix Condition="'$(IsPackable)' == 'true'">5.1.3</VersionPrefix>
<PackageValidationBaselineVersion>5.1.2</PackageValidationBaselineVersion>
Expand Down
5 changes: 4 additions & 1 deletion src/System.Runtime.CompilerServices.Unsafe/Versioning.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<Project>

<PropertyGroup>
<IsPackable>false</IsPackable>
<IsPackable>true</IsPackable>
<VersionPrefix>6.1.1</VersionPrefix>
<VersionPrefix Condition="'$(IsPackable)' == 'true'">6.1.2</VersionPrefix>
<AssemblyVersion Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">6.0.2.0</AssemblyVersion>
<AssemblyVersion Condition="'$(IsPackable)' == 'true' and $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">6.0.3.0</AssemblyVersion>
<PackageValidationBaselineVersion>6.1.1</PackageValidationBaselineVersion>
</PropertyGroup>

</Project>
7 changes: 0 additions & 7 deletions src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@
<!-- VersionPrefix and IsPackable are defined in the parent folder's Versioning.props file. -->
<Import Project="..\Versioning.props" />

<!-- Package servicing properties -->
<PropertyGroup>
<AssemblyVersion Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">6.0.1.0</AssemblyVersion>
<AssemblyVersion Condition="'$(IsPackable)' == 'true' and $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">6.0.2.0</AssemblyVersion>
<PackageValidationBaselineVersion>6.1.0</PackageValidationBaselineVersion>
</PropertyGroup>

<PropertyGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp' and '$(IsPlaceholderTargetFramework)' != 'true'">
<ExtraMacros>#define netcoreapp</ExtraMacros>
<CoreAssembly>System.Runtime</CoreAssembly>
Expand Down
4 changes: 4 additions & 0 deletions src/System.Runtime.CompilerServices.Unsafe/ver/Versioning.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@

<Import Project="..\Versioning.props" />

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<!-- Package servicing properties -->
<PropertyGroup>
<IsPackable>false</IsPackable>
<IsPackable>true</IsPackable>
<VersionPrefix>4.6.2</VersionPrefix>
<VersionPrefix Condition="'$(IsPackable)' == 'true'">4.6.3</VersionPrefix>
<AssemblyVersion Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">4.2.3.0</AssemblyVersion>
Expand Down
Loading