Skip to content

Commit f589433

Browse files
webbwebbwebbwebbwebbwebb
committed
Upgrade to dotnetcore 3.1
1 parent 566a5b7 commit f589433

File tree

8 files changed

+51
-302
lines changed

8 files changed

+51
-302
lines changed

‎src/git-diff-xlsx.sln‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28307.271
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30002.166
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "git-diff-xlsx", "git-diff-xlsx\git-diff-xlsx.csproj", "{77B1C34C-9048-4189-B551-5A63B71F51DA}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "git-diff-xlsx", "git-diff-xlsx\git-diff-xlsx.csproj", "{2F71B436-F072-493F-BC13-355EFE42DB54}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "git-diff-xlsx.tests", "git-diff-xlsx.tests\git-diff-xlsx.tests.csproj", "{3EDA3B82-E0D9-4475-8DA9-D0AFE8F19AE2}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "git-diff-xlsx.tests", "git-diff-xlsx.tests\git-diff-xlsx.tests.csproj", "{2EF1D20F-C095-40BC-BB3C-F42746EC9831}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
Debug|Any CPU = Debug|Any CPU
1313
Release|Any CPU = Release|Any CPU
1414
EndGlobalSection
1515
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{77B1C34C-9048-4189-B551-5A63B71F51DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17-
{77B1C34C-9048-4189-B551-5A63B71F51DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
18-
{77B1C34C-9048-4189-B551-5A63B71F51DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
19-
{77B1C34C-9048-4189-B551-5A63B71F51DA}.Release|Any CPU.Build.0 = Release|Any CPU
20-
{3EDA3B82-E0D9-4475-8DA9-D0AFE8F19AE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{3EDA3B82-E0D9-4475-8DA9-D0AFE8F19AE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{3EDA3B82-E0D9-4475-8DA9-D0AFE8F19AE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{3EDA3B82-E0D9-4475-8DA9-D0AFE8F19AE2}.Release|Any CPU.Build.0 = Release|Any CPU
16+
{2F71B436-F072-493F-BC13-355EFE42DB54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{2F71B436-F072-493F-BC13-355EFE42DB54}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{2F71B436-F072-493F-BC13-355EFE42DB54}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{2F71B436-F072-493F-BC13-355EFE42DB54}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{2EF1D20F-C095-40BC-BB3C-F42746EC9831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{2EF1D20F-C095-40BC-BB3C-F42746EC9831}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{2EF1D20F-C095-40BC-BB3C-F42746EC9831}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{2EF1D20F-C095-40BC-BB3C-F42746EC9831}.Release|Any CPU.Build.0 = Release|Any CPU
2424
EndGlobalSection
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE

‎src/git-diff-xlsx.tests/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎src/git-diff-xlsx.tests/git-diff-xlsx.tests.csproj‎

Lines changed: 27 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,40 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
4-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
53
<PropertyGroup>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{3EDA3B82-E0D9-4475-8DA9-D0AFE8F19AE2}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>git_diff_xlsx.tests</RootNamespace>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
125
<AssemblyName>git-diff-xlsx.tests</AssemblyName>
13-
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
<Deterministic>true</Deterministic>
16-
<NuGetPackageImportStamp>
17-
</NuGetPackageImportStamp>
18-
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
6+
<RootNamespace>git_diff_xlsx.tests</RootNamespace>
357
</PropertyGroup>
8+
369
<ItemGroup>
37-
<Reference Include="ApprovalTests, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
38-
<HintPath>..\packages\ApprovalTests.4.0.0\lib\netstandard2.0\ApprovalTests.dll</HintPath>
39-
</Reference>
40-
<Reference Include="ApprovalUtilities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
41-
<HintPath>..\packages\ApprovalUtilities.4.0.0\lib\net461\ApprovalUtilities.dll</HintPath>
42-
</Reference>
43-
<Reference Include="DocumentFormat.OpenXml, Version=2.11.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
44-
<HintPath>..\packages\DocumentFormat.OpenXml.2.11.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
45-
</Reference>
46-
<Reference Include="Microsoft.Win32.Registry, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Microsoft.Win32.Registry.4.5.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
48-
</Reference>
49-
<Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
50-
<HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
51-
</Reference>
52-
<Reference Include="System" />
53-
<Reference Include="System.Core" />
54-
<Reference Include="System.Data.SqlClient, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
55-
<HintPath>..\packages\System.Data.SqlClient.4.5.1\lib\net461\System.Data.SqlClient.dll</HintPath>
56-
</Reference>
57-
<Reference Include="System.Drawing" />
58-
<Reference Include="System.Drawing.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
59-
<HintPath>..\packages\System.Drawing.Common.4.5.0\lib\net461\System.Drawing.Common.dll</HintPath>
60-
</Reference>
61-
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
62-
<HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
63-
<Private>True</Private>
64-
<Private>True</Private>
65-
</Reference>
66-
<Reference Include="System.IO.Packaging, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
67-
<HintPath>..\packages\System.IO.Packaging.4.7.0\lib\net46\System.IO.Packaging.dll</HintPath>
68-
</Reference>
69-
<Reference Include="System.Management" />
70-
<Reference Include="System.Security.AccessControl, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
71-
<HintPath>..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll</HintPath>
72-
</Reference>
73-
<Reference Include="System.Security.Principal.Windows, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74-
<HintPath>..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
75-
</Reference>
76-
<Reference Include="System.Xml.Linq" />
77-
<Reference Include="System.Data.DataSetExtensions" />
78-
<Reference Include="Microsoft.CSharp" />
79-
<Reference Include="System.Data" />
80-
<Reference Include="System.Net.Http" />
81-
<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.1\lib\netstandard2.0\TextCopy.dll</HintPath>
84-
</Reference>
85-
<Reference Include="WindowsBase" />
86-
</ItemGroup>
87-
<ItemGroup>
88-
<Compile Include="ExcelFilePrinterTests.cs" />
89-
<Compile Include="Properties\AssemblyInfo.cs" />
90-
<Compile Include="Resources.Designer.cs">
91-
<AutoGen>True</AutoGen>
92-
<DesignTime>True</DesignTime>
93-
<DependentUpon>Resources.resx</DependentUpon>
94-
</Compile>
10+
<PackageReference Include="ApprovalTests" Version="4.0.0" />
11+
<PackageReference Include="ApprovalUtilities" Version="4.0.0" />
12+
<PackageReference Include="DocumentFormat.OpenXml" Version="2.11.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
14+
<PackageReference Include="NUnit" Version="3.12.0" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
9519
</ItemGroup>
20+
9621
<ItemGroup>
97-
<None Include="packages.config" />
98-
<None Include="TestFiles\SingleSheetWithCalculatedAndFormattedValues.xlsx" />
99-
<None Include="TestFiles\SingleSheetWithCalculatedValues.xlsx" />
100-
<None Include="TestFiles\SingleSheetWithNumericValues.xlsx" />
101-
<None Include="TestFiles\SingleSheetWithPlainTextValues.xlsx" />
22+
<ProjectReference Include="..\git-diff-xlsx\git-diff-xlsx.csproj" />
10223
</ItemGroup>
24+
10325
<ItemGroup>
104-
<ProjectReference Include="..\git-diff-xlsx\git-diff-xlsx.csproj">
105-
<Project>{77b1c34c-9048-4189-b551-5a63b71f51da}</Project>
106-
<Name>git-diff-xlsx</Name>
107-
</ProjectReference>
26+
<Compile Update="Resources.Designer.cs">
27+
<DependentUpon>Resources.resx</DependentUpon>
28+
<DesignTime>True</DesignTime>
29+
<AutoGen>True</AutoGen>
30+
</Compile>
10831
</ItemGroup>
32+
10933
<ItemGroup>
110-
<EmbeddedResource Include="Resources.resx">
111-
<Generator>ResXFileCodeGenerator</Generator>
34+
<EmbeddedResource Update="Resources.resx">
11235
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
36+
<Generator>ResXFileCodeGenerator</Generator>
11337
</EmbeddedResource>
11438
</ItemGroup>
115-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
116-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
117-
<PropertyGroup>
118-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
119-
</PropertyGroup>
120-
<Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
121-
</Target>
122-
</Project>
39+
40+
</Project>

‎src/git-diff-xlsx.tests/packages.config‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/git-diff-xlsx/App.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/git-diff-xlsx/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎src/git-diff-xlsx/git-diff-xlsx.csproj‎

Lines changed: 12 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,17 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{77B1C34C-9048-4189-B551-5A63B71F51DA}</ProjectGuid>
84
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>git_diff_xlsx</RootNamespace>
11-
<AssemblyName>git-diff-xlsx</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
16-
<TargetFrameworkProfile />
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<PackageId>git-diff-xlsx</PackageId>
7+
<Authors>Mark Webb</Authors>
8+
<Product>git-diff-xlsx</Product>
9+
<Company>Summerhouse Software Limited</Company>
10+
<Copyright>Copyright © Summerhouse Software 2016-2020</Copyright>
1711
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<PlatformTarget>AnyCPU</PlatformTarget>
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<PlatformTarget>AnyCPU</PlatformTarget>
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
36-
<UseVSHostingProcess>false</UseVSHostingProcess>
37-
</PropertyGroup>
38-
<ItemGroup>
39-
<Reference Include="DocumentFormat.OpenXml, Version=2.11.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
40-
<HintPath>..\packages\DocumentFormat.OpenXml.2.11.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
41-
</Reference>
42-
<Reference Include="System" />
43-
<Reference Include="System.Core" />
44-
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
45-
<HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
46-
<Private>True</Private>
47-
<Private>True</Private>
48-
</Reference>
49-
<Reference Include="System.IO.Packaging, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
50-
<HintPath>..\packages\System.IO.Packaging.4.7.0\lib\net46\System.IO.Packaging.dll</HintPath>
51-
</Reference>
52-
<Reference Include="System.Runtime.Serialization" />
53-
<Reference Include="System.Xml.Linq" />
54-
<Reference Include="System.Data.DataSetExtensions" />
55-
<Reference Include="Microsoft.CSharp" />
56-
<Reference Include="System.Data" />
57-
<Reference Include="System.Xml" />
58-
<Reference Include="WindowsBase" />
59-
</ItemGroup>
60-
<ItemGroup>
61-
<Compile Include="CellValueTypeEnum.cs" />
62-
<Compile Include="CellContext.cs" />
63-
<Compile Include="ElementHandlers\CellFormulaStartElementHandler.cs" />
64-
<Compile Include="ElementHandlers\CellInlineStringStartElementHandler.cs" />
65-
<Compile Include="ElementHandlers\CellStartElementHandler.cs" />
66-
<Compile Include="ElementHandlers\CellValueStartElementHandler.cs" />
67-
<Compile Include="ElementHandlers\CellEndElementHandler.cs" />
68-
<Compile Include="ElementHandlers\StartElementHandler.cs" />
69-
<Compile Include="ElementHandlers\EndElementHandler.cs" />
70-
<Compile Include="ExcelFilePrinter.cs" />
71-
<Compile Include="Program.cs" />
72-
<Compile Include="Properties\AssemblyInfo.cs" />
73-
</ItemGroup>
12+
7413
<ItemGroup>
75-
<None Include="App.config" />
76-
<None Include="packages.config" />
14+
<PackageReference Include="DocumentFormat.OpenXml" Version="2.11.0" />
7715
</ItemGroup>
78-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
79-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
80-
Other similar extension points exist, see Microsoft.Common.targets.
81-
<Target Name="BeforeBuild">
82-
</Target>
83-
<Target Name="AfterBuild">
84-
</Target>
85-
-->
86-
</Project>
16+
17+
</Project>

0 commit comments

Comments
 (0)