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

Fixes Issue #4705 - Wrong version numbers in dlls #4706

Merged
merged 27 commits into from
May 26, 2024
Merged

Fixes Issue #4705 - Wrong version numbers in dlls #4706

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c0e3970
Fixes Issue #4705
OsirisTerje May 7, 2024
55737bb
Delete src/src.sln
OsirisTerje May 9, 2024
54a699d
Changed to using conditionals in the directory.build.props and adjust…
OsirisTerje May 10, 2024
67f2016
Merge branch 'fileversionissue' of https://github.com/nunit/nunit int…
OsirisTerje May 10, 2024
361e24d
Adding caketest
OsirisTerje May 13, 2024
9d66172
Update src/NUnitFramework/framework/nunit.framework.csproj
OsirisTerje May 13, 2024
a100204
Update src/NUnitFramework/nunit.framework.legacy/nunit.framework.lega…
OsirisTerje May 13, 2024
8bcdfd9
Update src/NUnitFramework/nunitlite/nunitlite.csproj
OsirisTerje May 13, 2024
013a570
updated files and directory.build.props
OsirisTerje May 13, 2024
d9673d0
commented out Choose, didnt work, in directory.build.props
OsirisTerje May 13, 2024
f2066b4
Merge branch 'fileversionissue' of https://github.com/nunit/nunit int…
OsirisTerje May 13, 2024
0840495
Updated some tests, fixing nullrefs
OsirisTerje May 13, 2024
d9758f2
reverted formatting
OsirisTerje May 13, 2024
6a357c4
fix compiler warnings/errors
OsirisTerje May 13, 2024
1b6232a
updated cake
OsirisTerje May 13, 2024
b644884
Raise Error when compiling for a TargetFramework with no AssemblyConf…
manfred-brands May 14, 2024
8e05bb3
Fixed null suppressions
OsirisTerje May 16, 2024
0aed733
Merge branch 'fileversionissue' of https://github.com/nunit/nunit int…
OsirisTerje May 16, 2024
51ad8bd
Moved cake scripts to its own project and loaded the code into the bu…
OsirisTerje May 16, 2024
35ea372
Fix null
OsirisTerje May 21, 2024
e67372a
Fix more minor stuff
OsirisTerje May 21, 2024
94fd293
Fix SA warnings
OsirisTerje May 21, 2024
dc6ba23
Using same file and assembly version numbers, same as we have done ea…
OsirisTerje May 23, 2024
a604a39
Final review changes
manfred-brands May 25, 2024
3eb3e00
Fetch tags in CI
manfred-brands May 25, 2024
7d5efb0
Updated to cake 4. Get a warnign about other cake tools like minver, …
OsirisTerje May 25, 2024
543d782
Now we can use AsSpan in CakeScript
manfred-brands May 26, 2024
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
24 changes: 13 additions & 11 deletions src/NUnitFramework/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,36 +38,38 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>
<!--<Choose>

<Choose>
<When Condition="'$(TargetFramework)' == 'net462'">
<PropertyGroup>
<AssemblyConfiguration>.NET Framework 4.6.2 $(Configuration)</AssemblyConfiguration>
</PropertyGroup>
</When>
<When Condition="'$(TargetFramework)' == 'net6.0'">
<When Condition="$(TargetFramework.StartsWith('net6.0'))">
<PropertyGroup>
<AssemblyConfiguration>.NET 6.0 $(Configuration)</AssemblyConfiguration>
</PropertyGroup>
</When>
<When Condition="'$(TargetFramework)' == 'net7.0'">
<PropertyGroup>
<AssemblyConfiguration>.NET 7.0 $(Configuration)</AssemblyConfiguration>
</PropertyGroup>
</When>
<When Condition="'$(TargetFramework)' == 'net8.0'">
<When Condition="$(TargetFramework.StartsWith('net8.0'))">
<PropertyGroup>
<AssemblyConfiguration>.NET 8.0 $(Configuration)</AssemblyConfiguration>
</PropertyGroup>
</When>
<When Condition="'$(TargetFramework)' == 'net9.0'">
<When Condition="$(TargetFramework.StartsWith('net9.0'))">
<PropertyGroup>
<AssemblyConfiguration>.NET 9.0 $(Configuration)</AssemblyConfiguration>
</PropertyGroup>
</When>
<Otherwise>
<Error Text="MissingAssemblyConfiguration for $(TargetFramework)" />
<PropertyGroup>
<AssemblyConfiguration />
</PropertyGroup>
</Otherwise>
</Choose>-->
</Choose>

<Target Name="CheckConfiguration" BeforeTargets="Compile">
<Error Condition="'$(AssemblyConfiguration)' == ''" Text="Missing AssemblyConfiguration for $(TargetFramework)" />
</Target>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitFramework/benchmarks/nunit.framework.benchmarks/nunit.framework.benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
<Optimize>true</Optimize>
Expand Down