diff options
| author | Sergey Chebotar <s.chebotar@gmail.com> | 2022-12-19 08:37:26 +0300 |
|---|---|---|
| committer | Sergey Chebotar <s.chebotar@gmail.com> | 2022-12-19 08:37:26 +0300 |
| commit | a7e5a500e1c78ebc556f09831402838903fa4b79 (patch) | |
| tree | 6a974a96e2d9012fe05d22eb2cd5cdd0206589ba /src/Properties | |
| parent | e7d590bd2387f656d0b12db6fbe09abf647623bd (diff) | |
| parent | b66cc8fdce099daaf42f90ca8ae488bebd47d125 (diff) | |
Merge branch 'dev'
Diffstat (limited to 'src/Properties')
| -rw-r--r-- | src/Properties/AssemblyInfo.cs | 4 | ||||
| -rw-r--r-- | src/Properties/ExcelDna.Build.props | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index d254dfc..6a5c3a2 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.4.3")] -[assembly: AssemblyFileVersion("1.0.4.3")] +[assembly: AssemblyVersion("1.0.5.0")] +[assembly: AssemblyFileVersion("1.0.5.0")] diff --git a/src/Properties/ExcelDna.Build.props b/src/Properties/ExcelDna.Build.props index 1fed993..f5fdab1 100644 --- a/src/Properties/ExcelDna.Build.props +++ b/src/Properties/ExcelDna.Build.props @@ -72,6 +72,15 @@ Suffix used for packed .xll files e.g. MyAddIn-packed.xll --> <ExcelDnaPackXllSuffix Condition="'$(ExcelDnaPackXllSuffix)' == ''">-packed</ExcelDnaPackXllSuffix> + + <!-- + Options used when packing .xll files. + When in trouble with your virus scanner, try uncommenting at least the resource compression properties. + The default is true for both compression and multithreaded runs when not specified. + --> + <!--<ExcelDnaPackCompressResources Condition="'$(ConfigurationName)' == 'Debug'">false</ExcelDnaPackCompressResources>--> + <!--<ExcelDnaPackRunMultithreaded Condition="'$(ConfigurationName)' == 'Debug'">false</ExcelDnaPackRunMultithreaded>--> + <!--<ExcelDnaPackCompressResources Condition="'$(ConfigurationName)' == 'Release'">false</ExcelDnaPackCompressResources>--> + <!--<ExcelDnaPackRunMultithreaded Condition="'$(ConfigurationName)' == 'Release'">false</ExcelDnaPackRunMultithreaded>--> </PropertyGroup> </Project> - |