Skip to content

Commit d450440

Browse files
committed
nuget update test and cli project
1 parent e8ce137 commit d450440

File tree

10 files changed

+80
-37
lines changed

10 files changed

+80
-37
lines changed

Source/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@
6060
<RunCodeAnalysisRestore>true</RunCodeAnalysisRestore>
6161
</PropertyGroup>
6262
<ItemGroup>
63-
<Reference Include="CommandLine, Version=2.2.1.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
64-
<HintPath>..\packages\CommandLineParser.2.2.1\lib\net45\CommandLine.dll</HintPath>
63+
<Reference Include="CommandLine, Version=2.3.0.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
64+
<HintPath>..\packages\CommandLineParser.2.3.0\lib\net45\CommandLine.dll</HintPath>
6565
</Reference>
66-
<Reference Include="Octokit, Version=0.29.0.0, Culture=neutral, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Octokit.0.29.0\lib\net45\Octokit.dll</HintPath>
66+
<Reference Include="Octokit, Version=0.32.0.0, Culture=neutral, processorArchitecture=MSIL">
67+
<HintPath>..\packages\Octokit.0.32.0\lib\net45\Octokit.dll</HintPath>
6868
</Reference>
6969
<Reference Include="System" />
7070
<Reference Include="System.Core" />
@@ -94,10 +94,8 @@
9494
</ItemGroup>
9595
<ItemGroup>
9696
<None Include="app.config" />
97-
<None Include="packages.config">
98-
<SubType>Designer</SubType>
99-
</None>
10097
<Compile Include="Program.cs" />
98+
<None Include="packages.config" />
10199
</ItemGroup>
102100
<ItemGroup>
103101
<CodeAnalysisDictionary Include="..\CustomDictionary.xml">
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CommandLineParser" version="2.2.1" targetFramework="net451" />
4-
<package id="Octokit" version="0.29.0" targetFramework="net451" />
3+
<package id="CommandLineParser" version="2.3.0" targetFramework="net451" />
4+
<package id="Octokit" version="0.32.0" targetFramework="net451" />
55
</packages>

Source/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +10,7 @@
910
<AppDesignerFolder>Properties</AppDesignerFolder>
1011
<RootNamespace>GitReleaseManager.Tests</RootNamespace>
1112
<AssemblyName>GitReleaseManager.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
1415
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1516
<RestorePackages>true</RestorePackages>
@@ -36,31 +37,51 @@
3637
<DebugSymbols>true</DebugSymbols>
3738
</PropertyGroup>
3839
<ItemGroup>
39-
<Reference Include="AlphaFS, Version=2.1.0.0, Culture=neutral, PublicKeyToken=4d31a58f7d7ad5c9, processorArchitecture=MSIL">
40-
<HintPath>..\packages\AlphaFS.2.1.3\lib\net451\AlphaFS.dll</HintPath>
40+
<Reference Include="AlphaFS, Version=2.2.0.0, Culture=neutral, PublicKeyToken=4d31a58f7d7ad5c9, processorArchitecture=MSIL">
41+
<HintPath>..\packages\AlphaFS.2.2.6\lib\net452\AlphaFS.dll</HintPath>
4142
</Reference>
4243
<Reference Include="ApprovalTests, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
43-
<HintPath>..\packages\ApprovalTests.3.0.14\lib\net45\ApprovalTests.dll</HintPath>
44+
<HintPath>..\packages\ApprovalTests.3.0.18\lib\netstandard2.0\ApprovalTests.dll</HintPath>
4445
</Reference>
4546
<Reference Include="ApprovalUtilities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
46-
<HintPath>..\packages\ApprovalUtilities.3.0.14\lib\net45\ApprovalUtilities.dll</HintPath>
47+
<HintPath>..\packages\ApprovalUtilities.3.0.18\lib\net461\ApprovalUtilities.dll</HintPath>
4748
</Reference>
48-
<Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
49-
<HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
49+
<Reference Include="Microsoft.Win32.Registry, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
50+
<HintPath>..\packages\Microsoft.Win32.Registry.4.5.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
5051
</Reference>
51-
<Reference Include="Octokit, Version=0.29.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Octokit.0.29.0\lib\net45\Octokit.dll</HintPath>
52+
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
53+
<HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
54+
</Reference>
55+
<Reference Include="Octokit, Version=0.32.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Octokit.0.32.0\lib\net45\Octokit.dll</HintPath>
5357
</Reference>
5458
<Reference Include="System" />
5559
<Reference Include="System.Core" />
60+
<Reference Include="System.Data.SqlClient, Version=4.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
61+
<HintPath>..\packages\System.Data.SqlClient.4.6.0\lib\net461\System.Data.SqlClient.dll</HintPath>
62+
</Reference>
63+
<Reference Include="System.Drawing" />
64+
<Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
65+
<HintPath>..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
66+
</Reference>
67+
<Reference Include="System.Management" />
5668
<Reference Include="System.Net.Http" />
69+
<Reference Include="System.Security.AccessControl, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
70+
<HintPath>..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll</HintPath>
71+
</Reference>
72+
<Reference Include="System.Security.Principal.Windows, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
73+
<HintPath>..\packages\System.Security.Principal.Windows.4.5.1\lib\net461\System.Security.Principal.Windows.dll</HintPath>
74+
</Reference>
5775
<Reference Include="System.Transactions" />
5876
<Reference Include="System.Windows.Forms" />
5977
<Reference Include="System.Xml.Linq" />
6078
<Reference Include="System.Data.DataSetExtensions" />
6179
<Reference Include="Microsoft.CSharp" />
6280
<Reference Include="System.Data" />
6381
<Reference Include="System.Xml" />
82+
<Reference Include="TextCopy, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1ca091877d12ca03, processorArchitecture=MSIL">
83+
<HintPath>..\packages\TextCopy.1.5.0\lib\netstandard2.0\TextCopy.dll</HintPath>
84+
</Reference>
6485
</ItemGroup>
6586
<ItemGroup>
6687
<Compile Include="ApprovalTestConfig.cs" />
@@ -82,11 +103,6 @@
82103
<Link>SolutionInfo.cs</Link>
83104
</Compile>
84105
</ItemGroup>
85-
<ItemGroup>
86-
<None Include="packages.config">
87-
<SubType>Designer</SubType>
88-
</None>
89-
</ItemGroup>
90106
<ItemGroup>
91107
<ProjectReference Include="..\GitReleaseManager\GitReleaseManager.Core.csproj">
92108
<Project>{b02a026e-ca3a-48f4-bba9-eb337b0a2035}</Project>
@@ -99,10 +115,15 @@
99115
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
100116
</EmbeddedResource>
101117
</ItemGroup>
118+
<ItemGroup>
119+
<None Include="app.config" />
120+
<None Include="packages.config" />
121+
</ItemGroup>
102122
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
103123
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
104124
<PropertyGroup>
105125
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
106126
</PropertyGroup>
127+
<Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
107128
</Target>
108129
</Project>

Source/GitReleaseManager.Tests/ReleaseNotesBuilderTests.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ private static void AcceptTest(int commits, Config config, params Issue[] issues
151151

152152
private static Milestone CreateMilestone(string version)
153153
{
154-
return new Milestone(null, "https://github.com/gep13/FakeRepository/issues?q=milestone%3A" + version, 0, ItemState.Open, version, String.Empty, null, 0, 0, DateTimeOffset.Now, null, null, null);
154+
return new Milestone(null, "https://github.com/gep13/FakeRepository/issues?q=milestone%3A" + version, 0, null, ItemState.Open, version, String.Empty, null, 0, 0, DateTimeOffset.Now, null, null, null);
155155
}
156156

157157
private static Issue CreateIssue(int number, params string[] labels)
158158
{
159-
var user = new User(null, null, null, 0, null, DateTimeOffset.Now, DateTimeOffset.Now, 0, null, 0, 0, null, null, 0, 0, null, "gep13", "gep31", 0, null, 0, 0, 0, null, null, false, null, null);
159+
var user = new User(null, null, null, 0, null, DateTimeOffset.Now, DateTimeOffset.Now, 0, null, 0, 0, null, null, 0, 0, null, null, "gep13", "gep31", 0, null, 0, 0, 0, null, null, false, null, null);
160160

161161
return new Issue(
162162
null,
@@ -168,9 +168,9 @@ private static Issue CreateIssue(int number, params string[] labels)
168168
"Issue " + number,
169169
"Some issue",
170170
null,
171-
null,
172-
labels.Select(x => new Label(null, x, null)).ToArray(),
173171
user,
172+
labels.Select(x => new Label(null, x, null, null, null, false)).ToArray(),
173+
null,
174174
null,
175175
null,
176176
0,
@@ -179,7 +179,9 @@ private static Issue CreateIssue(int number, params string[] labels)
179179
DateTimeOffset.Now,
180180
null,
181181
0,
182+
null,
182183
false,
184+
null,
183185
null);
184186
}
185187
}

Source/GitReleaseManager.Tests/ReleaseNotesExporterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private static Release CreateRelease(int id, DateTime createdDateTime, string mi
8686
stringBuilder.AppendLine();
8787
stringBuilder.AppendLine("- [__#3__](http://example.com/3) Issue 3");
8888

89-
return new Release(null, null, null, null, id, milestone, "master", milestone, stringBuilder.ToString(), false, false, createdDateTime, null, null, null, null, null);
89+
return new Release(null, null, null, null, id, null, milestone, "master", milestone, stringBuilder.ToString(), false, false, createdDateTime, null, null, null, null, null);
9090
}
9191
}
9292
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="AlphaFS" publicKeyToken="4d31a58f7d7ad5c9" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
8+
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
12+
</dependentAssembly>
13+
</assemblyBinding>
14+
</runtime>
15+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>
Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AlphaFS" version="2.1.3" targetFramework="net451" />
4-
<package id="ApprovalTests" version="3.0.14" targetFramework="net451" />
5-
<package id="ApprovalUtilities" version="3.0.14" targetFramework="net451" />
6-
<package id="NUnit" version="3.9.0" targetFramework="net451" />
7-
<package id="Octokit" version="0.29.0" targetFramework="net451" />
3+
<package id="AlphaFS" version="2.2.6" targetFramework="net472" />
4+
<package id="ApprovalTests" version="3.0.18" targetFramework="net472" />
5+
<package id="ApprovalUtilities" version="3.0.18" targetFramework="net472" />
6+
<package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net472" />
7+
<package id="NUnit" version="3.11.0" targetFramework="net472" />
8+
<package id="Octokit" version="0.32.0" targetFramework="net472" />
9+
<package id="System.Data.SqlClient" version="4.6.0" targetFramework="net472" />
10+
<package id="System.Drawing.Common" version="4.5.1" targetFramework="net472" />
11+
<package id="System.Management" version="4.5.0" targetFramework="net472" />
12+
<package id="System.Security.AccessControl" version="4.5.0" targetFramework="net472" />
13+
<package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net472" />
14+
<package id="TextCopy" version="1.5.0" targetFramework="net472" />
815
</packages>

Source/GitReleaseManager/Configuration/ConfigSerializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static void WriteSample(TextWriter writer)
3939
{
4040
if (writer == null)
4141
{
42-
throw new ArgumentNullException("writer");
42+
throw new ArgumentNullException(nameof(writer));
4343
}
4444

4545
writer.WriteLine(@"# create:");

Source/GitReleaseManager/Configuration/ConfigurationProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static Config Provide(string gitDirectory, IFileSystem fileSystem)
1919
{
2020
if (fileSystem == null)
2121
{
22-
throw new ArgumentNullException("fileSystem");
22+
throw new ArgumentNullException(nameof(fileSystem));
2323
}
2424

2525
var configFilePath = GetConfigFilePath(gitDirectory);
@@ -52,7 +52,7 @@ public static void WriteSample(string targetDirectory, IFileSystem fileSystem)
5252
{
5353
if (fileSystem == null)
5454
{
55-
throw new ArgumentNullException("fileSystem");
55+
throw new ArgumentNullException(nameof(fileSystem));
5656
}
5757

5858
var configFilePath = GetConfigFilePath(targetDirectory);

Source/GitReleaseManager/OctokitExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static Uri HtmlUrl(this Milestone milestone)
4949
{
5050
if (milestone == null)
5151
{
52-
throw new ArgumentNullException("milestone");
52+
throw new ArgumentNullException(nameof(milestone));
5353
}
5454

5555
var parts = milestone.Url.Split('/');

0 commit comments

Comments
 (0)