Skip to content

Commit

Permalink
Merge pull request #1050 from doug24/February-release
Browse files Browse the repository at this point in the history
February release
  • Loading branch information
doug24 committed Feb 13, 2024
2 parents 797dfbc + 47c6b99 commit a200593
Show file tree
Hide file tree
Showing 14 changed files with 237 additions and 222 deletions.
6 changes: 3 additions & 3 deletions Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageReference Include="xunit" Version="2.6.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ assembly_info:
assembly_file_version: '{version}'
assembly_informational_version: '{version}'
install:
- ps: ./dotnet-install.ps1 -Channel 8.0 -Version 8.0.101
- ps: ./dotnet-install.ps1 -Channel 8.0 -Version 8.0.200
before_build:
- cmd: nuget restore
build:
Expand Down
2 changes: 1 addition & 1 deletion dnGREP.Common.UI/dnGREP.Common.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
</PackageReference>
<PackageReference Include="NLog">
<Version>5.2.7</Version>
<Version>5.2.8</Version>
</PackageReference>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion dnGREP.Common/dnGREP.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<Version>13.0.3</Version>
</PackageReference>
<PackageReference Include="NLog">
<Version>5.2.7</Version>
<Version>5.2.8</Version>
</PackageReference>
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageReference Include="UTF.Unknown">
Expand Down
2 changes: 1 addition & 1 deletion dnGREP.Engines/dnGREP.Engines.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NLog">
<Version>5.2.7</Version>
<Version>5.2.8</Version>
</PackageReference>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
Expand Down
2 changes: 1 addition & 1 deletion dnGREP.Everything/dnGREP.Everything.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NLog">
<Version>5.2.7</Version>
<Version>5.2.8</Version>
</PackageReference>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
Expand Down
2 changes: 1 addition & 1 deletion dnGREP.Localization/dnGREP.Localization.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NLog">
<Version>5.2.7</Version>
<Version>5.2.8</Version>
</PackageReference>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
<PrivateAssets>all</PrivateAssets>
Expand Down
4 changes: 2 additions & 2 deletions dnGREP.OpenXmlEngine/dnGREP.OpenXmlEngine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml">
<Version>3.0.0</Version>
<Version>3.0.1</Version>
</PackageReference>
<PackageReference Include="ExcelDataReader">
<Version>3.6.0</Version>
Expand All @@ -57,7 +57,7 @@
</PackageReference>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NLog">
<Version>5.2.7</Version>
<Version>5.2.8</Version>
</PackageReference>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
Expand Down
2 changes: 1 addition & 1 deletion dnGREP.PdfEngine/dnGREP.PdfEngine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NLog">
<Version>5.2.7</Version>
<Version>5.2.8</Version>
</PackageReference>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
Expand Down
2 changes: 1 addition & 1 deletion dnGREP.Setup/Fragments/Dotnet.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<File Id="filD101FC4DA814CAB2847D9DA443BA18C2" KeyPath="yes" Source="$(var.PublishDir)\mscordaccore.dll" />
</Component>
<Component Id="cmpE115ABDFD132AD880024EE2939D54BF1" Guid="{3060FE5D-6F21-43CB-A584-57BD23D9FDF9}">
<File Id="fil50ADE2B6BA6A9BAD2A38D1A83A3227E4" KeyPath="yes" Source="$(var.PublishDir)\mscordaccore_$(var.Platform.Id)_$(var.Platform.Id)_8.0.123.58001.dll" />
<File Id="fil50ADE2B6BA6A9BAD2A38D1A83A3227E4" KeyPath="yes" Source="$(var.PublishDir)\mscordaccore_$(var.Platform.Id)_$(var.Platform.Id)_8.0.224.6711.dll" />
</Component>
<Component Id="cmp8919AF6C6904B98D882508E0D18E868B" Guid="{FAC75B35-5646-4042-8BBB-B7FD5AEE4476}">
<File Id="filA9E828B55293AF9546D153D082D8422A" KeyPath="yes" Source="$(var.PublishDir)\mscordbi.dll" />
Expand Down
2 changes: 1 addition & 1 deletion dnGREP.Setup/dnGREP.Setup.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
Other similar extension points exist, see Wix.targets.
-->
<Target Name="BeforeBuild">
<Exec Command="dotnet publish $(ProjectDir)..\dnGrep.WPF -p:PublishProfile=win-$(Platform)FolderProfile.pubxml /p:Platform=$(Platform)" />
<Exec Command="dotnet publish $(ProjectDir)..\dnGrep.WPF\dnGREP.WPF.csproj -p:PublishProfile=win-$(Platform)FolderProfile.pubxml /p:Platform=$(Platform)" />
</Target>
<!--
<Target Name="AfterBuild">
Expand Down
2 changes: 1 addition & 1 deletion dnGREP.WPF/dnGREP.WPF.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
</PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
<PackageReference Include="NLog">
<Version>5.2.7</Version>
<Version>5.2.8</Version>
</PackageReference>
<PackageReference Include="StrongNamer">
<Version>0.2.5</Version>
Expand Down
2 changes: 1 addition & 1 deletion dnGREP.WordEngine/dnGREP.WordEngine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NLog">
<Version>5.2.7</Version>
<Version>5.2.8</Version>
</PackageReference>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
Expand Down

0 comments on commit a200593

Please sign in to comment.