diff options
-rw-r--r-- | RehauSku.Assist.sln | 4 | ||||
-rw-r--r-- | src/RehauSku.Assist.csproj | 31 | ||||
-rw-r--r-- | src/app.config | 4 | ||||
-rw-r--r-- | src/packages.config | 13 |
4 files changed, 38 insertions, 14 deletions
diff --git a/RehauSku.Assist.sln b/RehauSku.Assist.sln index 440314a..d5d77c2 100644 --- a/RehauSku.Assist.sln +++ b/RehauSku.Assist.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.0.32014.148 +VisualStudioVersion = 17.0.32112.339 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RehauSku.Assist", "src\RehauSku.Assist.csproj", "{18A2FF67-0E46-4A86-B872-29F2B3F23ADF}" EndProject @@ -20,6 +20,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {3CF61093-14A6-4A2D-AC13-53EBA2253BAA} + SolutionGuid = {5A843B33-66C3-49FB-B9BF-282AB120FD8C} EndGlobalSection EndGlobal diff --git a/src/RehauSku.Assist.csproj b/src/RehauSku.Assist.csproj index 2fcae24..2c6792c 100644 --- a/src/RehauSku.Assist.csproj +++ b/src/RehauSku.Assist.csproj @@ -39,19 +39,20 @@ <Private>True</Private> </Reference> <Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL"> - <HintPath>packages\ExcelDna.Integration.1.5.0\lib\net452\ExcelDna.Integration.dll</HintPath> - <Private>False</Private> + <HintPath>packages\ExcelDna.Integration.1.5.1\lib\net452\ExcelDna.Integration.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="ExcelDna.IntelliSense, Version=1.4.4.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL"> - <HintPath>packages\ExcelDna.IntelliSense.1.5.0\lib\net452\ExcelDna.IntelliSense.dll</HintPath> + <Reference Include="ExcelDna.IntelliSense, Version=1.5.1.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL"> + <HintPath>packages\ExcelDna.IntelliSense.1.5.1\lib\net452\ExcelDna.IntelliSense.dll</HintPath> </Reference> <Reference Include="ExcelDna.Registration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL"> - <HintPath>packages\ExcelDna.Registration.1.5.0\lib\net452\ExcelDna.Registration.dll</HintPath> + <HintPath>packages\ExcelDna.Registration.1.5.1\lib\net452\ExcelDna.Registration.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"> <HintPath>packages\ExcelDna.Interop.14.0.1\lib\Microsoft.Office.Interop.Excel.dll</HintPath> <EmbedInteropTypes>True</EmbedInteropTypes> + <Private>True</Private> </Reference> <Reference Include="Microsoft.Vbe.Interop, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"> <HintPath>packages\ExcelDna.Interop.14.0.1\lib\Microsoft.Vbe.Interop.dll</HintPath> @@ -69,6 +70,9 @@ <HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath> </Reference> <Reference Include="System.Configuration" /> + <Reference Include="System.Configuration.ConfigurationManager, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>packages\System.Configuration.ConfigurationManager.6.0.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath> + </Reference> <Reference Include="System.Core" /> <Reference Include="System.Data.OracleClient" /> <Reference Include="System.Drawing" /> @@ -83,11 +87,22 @@ <Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath> + <Private>True</Private> </Reference> <Reference Include="System.Security" /> + <Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll</HintPath> + </Reference> + <Reference Include="System.Security.Permissions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>packages\System.Security.Permissions.6.0.0\lib\net461\System.Security.Permissions.dll</HintPath> + </Reference> + <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath> + </Reference> <Reference Include="System.ServiceProcess" /> <Reference Include="System.Text.Encoding.CodePages, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <HintPath>packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath> + <Private>True</Private> </Reference> <Reference Include="System.Transactions" /> <Reference Include="System.Windows.Forms" /> @@ -123,17 +138,17 @@ </ItemGroup> <ItemGroup> <None Include="app.config" /> - <None Include="RehauSku.Assist-AddIn.dna" /> <None Include="packages.config" /> <None Include="Properties\ExcelDna.Build.props" /> + <None Include="RehauSku.Assist-AddIn.dna" /> </ItemGroup> <ItemGroup /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="packages\ExcelDna.AddIn.1.5.0\build\ExcelDna.AddIn.targets" Condition="Exists('packages\ExcelDna.AddIn.1.5.0\build\ExcelDna.AddIn.targets')" /> + <Import Project="packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets" Condition="Exists('packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> <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> </PropertyGroup> - <Error Condition="!Exists('packages\ExcelDna.AddIn.1.5.0\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\ExcelDna.AddIn.1.5.0\build\ExcelDna.AddIn.targets'))" /> + <Error Condition="!Exists('packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/src/app.config b/src/app.config index 3f5b7b7..eaef242 100644 --- a/src/app.config +++ b/src/app.config @@ -10,6 +10,10 @@ <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> + </dependentAssembly> </assemblyBinding> </runtime> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration> diff --git a/src/packages.config b/src/packages.config index 6e8f1d1..b92606b 100644 --- a/src/packages.config +++ b/src/packages.config @@ -1,15 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="AngleSharp" version="0.16.1" targetFramework="net48" /> - <package id="ExcelDna.AddIn" version="1.5.0" targetFramework="net480" /> - <package id="ExcelDna.Integration" version="1.5.0" targetFramework="net480" /> - <package id="ExcelDna.IntelliSense" version="1.5.0" targetFramework="net48" /> + <package id="ExcelDna.AddIn" version="1.5.1" targetFramework="net48" /> + <package id="ExcelDna.Integration" version="1.5.1" targetFramework="net48" /> + <package id="ExcelDna.IntelliSense" version="1.5.1" targetFramework="net48" /> <package id="ExcelDna.Interop" version="14.0.1" targetFramework="net48" /> - <package id="ExcelDna.Registration" version="1.5.0" targetFramework="net480" /> + <package id="ExcelDna.Registration" version="1.5.1" targetFramework="net48" /> <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" /> <package id="System.Buffers" version="4.5.1" targetFramework="net48" /> + <package id="System.Configuration.ConfigurationManager" version="6.0.0" targetFramework="net48" /> <package id="System.Memory" version="4.5.4" targetFramework="net48" /> <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" /> + <package id="System.Runtime.Caching" version="6.0.0" targetFramework="net48" /> <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" /> + <package id="System.Security.AccessControl" version="6.0.0" targetFramework="net48" /> + <package id="System.Security.Permissions" version="6.0.0" targetFramework="net48" /> + <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" /> <package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net48" /> </packages>
\ No newline at end of file |