Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ dotnet_diagnostic.IDE0058.severity = none

dotnet_diagnostic.CA1822.severity = none

MA.report_generated_code = false
dotnet_diagnostic.MA0003.severity = none
dotnet_diagnostic.MA0007.severity = none
dotnet_diagnostic.MA0038.severity = none
Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
</PackageReference>
</ItemGroup>

<Target Name="SetVersionFromGit" BeforeTargets="BeforeBuild">
<Exec Command="git.exe describe --tags --abbrev=0" WorkingDirectory="$(MSBuildProjectDirectory)" ConsoleToMsBuild="true" StandardOutputImportance="Low">
<Target Name="SetVersionFromGit" BeforeTargets="BeforeBuild;AssignTargetPaths" Condition="'$(GitTag)' == ''">
<Exec Command="git.exe describe --tags --abbrev=0" WorkingDirectory="$(MSBuildProjectDirectory)" ConsoleToMSBuild="true" StandardOutputImportance="Low">
<Output TaskParameter="ConsoleOutput" PropertyName="GitTag" />
</Exec>

Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Meziantou.Analyzer" Version="3.0.85" />
<PackageVersion Include="Meziantou.Analyzer" Version="3.0.217" />
<PackageVersion Include="Microsoft.PowerShell.5.1.ReferenceAssemblies" Version="1.0.0" />
<PackageVersion Include="NLog" Version="6.1.3" />
<PackageVersion Include="NLog" Version="6.2.0" />
<PackageVersion Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
</ItemGroup>
</Project>
13 changes: 3 additions & 10 deletions src/PSNLog/PSNLog.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net462</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<LangVersion>preview</LangVersion>
<LangVersion>14.0</LangVersion>
<AnalysisLevel>preview-All</AnalysisLevel>
</PropertyGroup>

Expand Down Expand Up @@ -184,14 +184,7 @@
<ModuleManifestName>PSNLog.psd1</ModuleManifestName>
</PropertyGroup>

<ItemGroup>
<Content Update="$(NameModuleManifest)">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
</ItemGroup>

<Target Name="CreateModuleManifest" AfterTargets="SetVersionFromGit" BeforeTargets="BeforeBuild">
<Target Name="CreateModuleManifest" AfterTargets="SetVersionFromGit" BeforeTargets="BeforeBuild;AssignTargetPaths">
<PropertyGroup>
<ModuleManifestContent>
@{
Expand Down Expand Up @@ -236,7 +229,7 @@
<WriteLinesToFile File="$(ModuleManifestName)" Overwrite="true" Lines="$(ModuleManifestContent)" />
</Target>

<Target Name="IncludeModuleManifest" AfterTargets="CreateModuleManifest" BeforeTargets="BeforeBuild">
<Target Name="IncludeModuleManifest" AfterTargets="CreateModuleManifest" BeforeTargets="BeforeBuild;AssignTargetPaths">
<ItemGroup>
<None Include="$(ModuleManifestName)" CopyToOutputDirectory="Always" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Tests/MSTestSettings.cs

This file was deleted.

4 changes: 2 additions & 2 deletions src/Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<TargetFramework>net462</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>preview</LangVersion>
<LangVersion>14.0</LangVersion>
<AnalysisLevel>preview-all</AnalysisLevel>
<MSTestAnalysisMode>all</MSTestAnalysisMode>
<IsPackable>false</IsPackable>
<MSTestParallelizeScope>None</MSTestParallelizeScope>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.PowerShell.5.1.ReferenceAssemblies" />
Expand Down
2 changes: 1 addition & 1 deletion src/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"msbuild-sdks": {
"MSTest.Sdk": "4.2.3"
"MSTest.Sdk": "4.4.0"
},
"test": {
"runner": "Microsoft.Testing.Platform"
Expand Down