Skip to content

Commit 09aacf2

Browse files
authored
Merge pull request #182 from apache/Feature/3.1.0-preview.1
#182 log4net 3.1.0-preview.1
2 parents fd4703e + 5963464 commit 09aacf2

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

scripts/build-preview.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dotnet build -c Release '-p:GeneratePackages=true' $PSScriptRoot/../src/log4net/log4net.csproj
1+
dotnet build -c Release '-p:GeneratePackages=true;PackageVersion=3.1.0-preview.1' $PSScriptRoot/../src/log4net/log4net.csproj

src/log4net.sln

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".doc", ".doc", "{33D80AD3-8
5050
..\doc\RELEASING.md = ..\doc\RELEASING.md
5151
EndProjectSection
5252
EndProject
53+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".scripts", ".scripts", "{C09A163E-D7A5-4CD2-9E1D-452266277CC1}"
54+
ProjectSection(SolutionItems) = preProject
55+
..\scripts\build-preview.ps1 = ..\scripts\build-preview.ps1
56+
..\scripts\install-dotnet-sdk.ps1 = ..\scripts\install-dotnet-sdk.ps1
57+
..\scripts\sign-log4net-libraries.ps1 = ..\scripts\sign-log4net-libraries.ps1
58+
..\scripts\sign-log4net-libraries.sh = ..\scripts\sign-log4net-libraries.sh
59+
..\scripts\update-version.ps1 = ..\scripts\update-version.ps1
60+
EndProjectSection
61+
EndProject
5362
Global
5463
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5564
Debug|Any CPU = Debug|Any CPU

src/log4net/log4net.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ log4net is designed with two distinct goals in mind: speed and flexibility
4545
<PackageIcon>package-icon.png</PackageIcon>
4646
<PackageTags>logging log tracing logfiles</PackageTags>
4747
<Owners>Apache Logging Project</Owners>
48-
<PackageVersion>$(Version)</PackageVersion>
4948
<PublishRepositoryUrl>true</PublishRepositoryUrl>
5049
<EmbedUntrackedSources>true</EmbedUntrackedSources>
5150
<AssemblyTitle>Apache log4net for .NET</AssemblyTitle>

src/site/xdoc/release/release-notes.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ limitations under the License.
3333
</ul>
3434
</section><section id="a3.1.0-enhancements" name="Enhancements">
3535
<ul>
36+
<li>
37+
<a href="https://github.com/apache/logging-log4net/pull/176">added source link</a> (by @FreeAndNil)
38+
</li>
3639
<li>
3740
<a href="https://github.com/apache/logging-log4net/issues/177">use ManagedThreadId for long running tasks</a> (reported by @Audela-220 fixed by @FreeAndNil)
3841
</li>
@@ -202,6 +205,9 @@ limitations under the License.
202205
<li>
203206
<a href="https://github.com/apache/logging-log4net/issues/168">ColoredConsoleAppender writes UTF-8 preamble to the console on initialization</a> (reported by @RoboBurned, fixed by @freeandnil)
204207
</li>
208+
<li>
209+
<a href="https://github.com/apache/logging-log4net/issues/179">Culture-Specific String Comparisons Cause RollingFileAppender Failure in log4net on NET 5+</a> (reported by @stianeklund)
210+
</li>
205211
</ul>
206212
</section><section id="a3.0.0-enhancements" name="Enhancements">
207213
<ul>

0 commit comments

Comments
 (0)