Skip to content

Commit

Permalink
Update support projects to target .NET Framework v4.8
Browse files Browse the repository at this point in the history
  • Loading branch information
augustoproiete committed Mar 31, 2020
1 parent eb66112 commit dd9cf9f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
3 changes: 3 additions & 0 deletions sample/SampleAddIn/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,7 @@
</source>
</sources>
</system.diagnostics>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
</configuration>
3 changes: 2 additions & 1 deletion sample/SampleAddIn/SampleAddIn.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SampleAddIn</RootNamespace>
<AssemblyName>SampleAddIn</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\assets\exceldna.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
14 changes: 7 additions & 7 deletions sample/SampleAddIn/packages.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ExcelDna.AddIn" version="1.1.0-beta1" targetFramework="net472" developmentDependency="true" />
<package id="ExcelDna.Integration" version="1.1.0-beta1" targetFramework="net472" />
<package id="ExcelDna.XmlSchemas" version="1.0.0" targetFramework="net472" />
<package id="Serilog" version="2.9.0" targetFramework="net472" />
<package id="Serilog.Sinks.ExcelDnaLogDisplay" version="1.1.1-beta1" targetFramework="net472" />
<package id="Serilog.Sinks.File" version="4.1.0" targetFramework="net472" />
</packages>
<package id="ExcelDna.AddIn" version="1.1.0-beta1" targetFramework="net48" developmentDependency="true" />
<package id="ExcelDna.Integration" version="1.1.0-beta1" targetFramework="net48" />
<package id="ExcelDna.XmlSchemas" version="1.0.0" targetFramework="net48" />
<package id="Serilog" version="2.9.0" targetFramework="net48" />
<package id="Serilog.Sinks.ExcelDnaLogDisplay" version="1.1.1-beta1" targetFramework="net48" />
<package id="Serilog.Sinks.File" version="4.1.0" targetFramework="net48" />
</packages>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net48</TargetFramework>
<!-- Don't reference the full NETStandard.Library -->
<DisableImplicitFrameworkReferences Condition=" '$(TargetFramework)' == 'net472' ">true</DisableImplicitFrameworkReferences>
<DisableImplicitFrameworkReferences Condition=" '$(TargetFramework)' == 'net48' ">true</DisableImplicitFrameworkReferences>

<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<NetStandardImplicitPackageVersion>1.0.0</NetStandardImplicitPackageVersion>
Expand All @@ -30,7 +30,7 @@
<PackageReference Include="xunit" Version="2.4.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
Expand Down

0 comments on commit dd9cf9f

Please sign in to comment.