Skip to content

Commit

Permalink
Merge pull request #1340 from sillsdev/copyright-dates-and-nupkg-gene…
Browse files Browse the repository at this point in the history
…ration

Updated copyright date. Suppressed generation of package files for test apps
  • Loading branch information
tombogle authored Aug 19, 2024
2 parents fad4b64 + 30af8d9 commit 8220e84
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Company>SIL International</Company>
<Authors>SIL International</Authors>
<Product>libpalaso</Product>
<Copyright>Copyright © 2010-2023 SIL International</Copyright>
<Copyright>Copyright © 2010-2024 SIL International</Copyright>
<WarningsAsErrors>NU1605;CS8002</WarningsAsErrors>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand Down
2 changes: 0 additions & 2 deletions SIL.WritingSystems.Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using System.Reflection;
using System.Runtime.InteropServices;
using SIL.TestUtilities;

[assembly: OfflineSldr]
19 changes: 5 additions & 14 deletions SIL.WritingSystems.Tests/WritingSystemOrphanFinderTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand All @@ -21,15 +21,12 @@ public TestEnvironment(string id1, string id2)
{
WritingSystemRepository = new TestLdmlInFolderWritingSystemRepository(WritingSystemsPath);
_file = _folder.GetNewTempFile(true);
File.WriteAllText(_file.Path, String.Format("|{0}||{0}||{1}|", id1, id2));
File.WriteAllText(_file.Path, $"|{id1}||{id1}||{id2}|");
}

private string WritingSystemsPath
{
get { return _folder.Combine("WritingSystems"); }
}
private string WritingSystemsPath => _folder.Combine("WritingSystems");

public LdmlInFolderWritingSystemRepository WritingSystemRepository { get; private set; }
public LdmlInFolderWritingSystemRepository WritingSystemRepository { get; }

public void Dispose()
{
Expand All @@ -56,13 +53,7 @@ public void ReplaceIdInFile(string oldid, string newid)
File.WriteAllText(_file.Path, fileContent);
}

public string FileContent
{
get
{
return File.ReadAllText(_file.Path);
}
}
public string FileContent => File.ReadAllText(_file.Path);
}

[Test]
Expand Down
2 changes: 2 additions & 0 deletions TestApps/ArchivingTestApp/ArchivingTestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<OutputType>WinExe</OutputType>
<TargetFrameworks>net8.0-windows</TargetFrameworks>
<Nullable>enable</Nullable>
<SignAssembly>false</SignAssembly>
<IsPackable>false</IsPackable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 2 additions & 0 deletions TestApps/ClipboardTestApp/ClipboardTestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<SignAssembly>false</SignAssembly>
<IsPackable>false</IsPackable>
<UseWindowsForms>true</UseWindowsForms>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
Expand Down

0 comments on commit 8220e84

Please sign in to comment.