-
Notifications
You must be signed in to change notification settings - Fork 52
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update projects and NuGet packages to target Excel-DNA v1.0.0 #84
Merged
govert
merged 2 commits into
Excel-DNA:master
from
augustoproiete-forks:target-exceldna-v1.0.0
Nov 7, 2019
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
Source/ExcelDna.IntelliSense.Host/Properties/ExcelDna.Build.props
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="ExcelDnaProps"> | ||
| <!-- | ||
| If you change properties in this file, they may not come into effect until you: | ||
| * Rebuild the solution/project | ||
|
|
||
| or | ||
|
|
||
| * Close Visual Studio | ||
| * Delete .vs folder, if exists | ||
| * Delete ProjectName.csproj.user (or equivalent for VB, F#, etc.), if exists | ||
| * Delete SolutionName.suo, if exists | ||
| * Open your solution/project again in Visual Studio | ||
| --> | ||
|
|
||
| <!-- | ||
| Configuration properties for debugging Excel-DNA add-ins | ||
| --> | ||
| <PropertyGroup> | ||
| <!-- | ||
| Enable/Disable setting the debug options when building the project | ||
| --> | ||
| <RunExcelDnaSetDebuggerOptions Condition="'$(RunExcelDnaSetDebuggerOptions)' == ''">true</RunExcelDnaSetDebuggerOptions> | ||
|
|
||
| <!-- | ||
| Override the path of EXCEL.EXE used for debugging the project, if you need | ||
| By default, it will use the latest version of Excel it can find on the machine | ||
| --> | ||
| <ExcelDnaExcelExePath Condition="'$(ExcelDnaExcelExePath)' == ''"></ExcelDnaExcelExePath> | ||
|
|
||
| <!-- | ||
| Override the name of the .XLL add-in to use when debugging the project, if you need | ||
| By default, it will use the first unpacked .xll add-in that matches the bitness of EXCEL.EXE | ||
| --> | ||
| <ExcelDnaAddInForDebugging Condition="'$(ExcelDnaAddInForDebugging)' == ''"></ExcelDnaAddInForDebugging> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- | ||
| Configuration properties for building .dna files | ||
| --> | ||
| <PropertyGroup> | ||
| <!-- | ||
| Enable/Disable automatic generation of platform-specific versions of .dna files | ||
| --> | ||
| <ExcelDnaCreate32BitAddIn Condition="'$(ExcelDnaCreate32BitAddIn)' == ''">true</ExcelDnaCreate32BitAddIn> | ||
| <ExcelDnaCreate64BitAddIn Condition="'$(ExcelDnaCreate64BitAddIn)' == ''">true</ExcelDnaCreate64BitAddIn> | ||
|
|
||
| <!-- | ||
| Define the suffix used for each platform-specific file e.g. MyAddIn64.dna | ||
| --> | ||
| <ExcelDna32BitAddInSuffix Condition="'$(ExcelDna32BitAddInSuffix)' == ''"></ExcelDna32BitAddInSuffix> | ||
| <ExcelDna64BitAddInSuffix Condition="'$(ExcelDna64BitAddInSuffix)' == ''">64</ExcelDna64BitAddInSuffix> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- | ||
| Configuration properties for packing .dna files | ||
| --> | ||
| <PropertyGroup> | ||
| <!-- | ||
| Enable/Disable packing of .dna files | ||
| --> | ||
| <RunExcelDnaPack Condition="'$(RunExcelDnaPack)' == ''">true</RunExcelDnaPack> | ||
|
|
||
| <!-- | ||
| Suffix used for packed .xll files e.g. MyAddIn-packed.xll | ||
| --> | ||
| <ExcelDnaPackXllSuffix Condition="'$(ExcelDnaPackXllSuffix)' == ''">-packed</ExcelDnaPackXllSuffix> | ||
| </PropertyGroup> | ||
| </Project> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="ExcelDna.AddIn" version="0.33.9" targetFramework="net40" /> | ||
| <package id="ExcelDna.Integration" version="0.33.9" targetFramework="net40" /> | ||
| <package id="ExcelDna.AddIn" version="1.0.0" targetFramework="net40" /> | ||
| <package id="ExcelDna.Integration" version="1.0.0" targetFramework="net40" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
Source/ExcelDna.IntelliSense.Tools/Properties/ExcelDna.Build.props
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="ExcelDnaProps"> | ||
| <!-- | ||
| If you change properties in this file, they may not come into effect until you: | ||
| * Rebuild the solution/project | ||
|
|
||
| or | ||
|
|
||
| * Close Visual Studio | ||
| * Delete .vs folder, if exists | ||
| * Delete ProjectName.csproj.user (or equivalent for VB, F#, etc.), if exists | ||
| * Delete SolutionName.suo, if exists | ||
| * Open your solution/project again in Visual Studio | ||
| --> | ||
|
|
||
| <!-- | ||
| Configuration properties for debugging Excel-DNA add-ins | ||
| --> | ||
| <PropertyGroup> | ||
| <!-- | ||
| Enable/Disable setting the debug options when building the project | ||
| --> | ||
| <RunExcelDnaSetDebuggerOptions Condition="'$(RunExcelDnaSetDebuggerOptions)' == ''">true</RunExcelDnaSetDebuggerOptions> | ||
|
|
||
| <!-- | ||
| Override the path of EXCEL.EXE used for debugging the project, if you need | ||
| By default, it will use the latest version of Excel it can find on the machine | ||
| --> | ||
| <ExcelDnaExcelExePath Condition="'$(ExcelDnaExcelExePath)' == ''"></ExcelDnaExcelExePath> | ||
|
|
||
| <!-- | ||
| Override the name of the .XLL add-in to use when debugging the project, if you need | ||
| By default, it will use the first unpacked .xll add-in that matches the bitness of EXCEL.EXE | ||
| --> | ||
| <ExcelDnaAddInForDebugging Condition="'$(ExcelDnaAddInForDebugging)' == ''"></ExcelDnaAddInForDebugging> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- | ||
| Configuration properties for building .dna files | ||
| --> | ||
| <PropertyGroup> | ||
| <!-- | ||
| Enable/Disable automatic generation of platform-specific versions of .dna files | ||
| --> | ||
| <ExcelDnaCreate32BitAddIn Condition="'$(ExcelDnaCreate32BitAddIn)' == ''">true</ExcelDnaCreate32BitAddIn> | ||
| <ExcelDnaCreate64BitAddIn Condition="'$(ExcelDnaCreate64BitAddIn)' == ''">true</ExcelDnaCreate64BitAddIn> | ||
|
|
||
| <!-- | ||
| Define the suffix used for each platform-specific file e.g. MyAddIn64.dna | ||
| --> | ||
| <ExcelDna32BitAddInSuffix Condition="'$(ExcelDna32BitAddInSuffix)' == ''"></ExcelDna32BitAddInSuffix> | ||
| <ExcelDna64BitAddInSuffix Condition="'$(ExcelDna64BitAddInSuffix)' == ''">64</ExcelDna64BitAddInSuffix> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- | ||
| Configuration properties for packing .dna files | ||
| --> | ||
| <PropertyGroup> | ||
| <!-- | ||
| Enable/Disable packing of .dna files | ||
| --> | ||
| <RunExcelDnaPack Condition="'$(RunExcelDnaPack)' == ''">true</RunExcelDnaPack> | ||
|
|
||
| <!-- | ||
| Suffix used for packed .xll files e.g. MyAddIn-packed.xll | ||
| --> | ||
| <ExcelDnaPackXllSuffix Condition="'$(ExcelDnaPackXllSuffix)' == ''">-packed</ExcelDnaPackXllSuffix> | ||
| </PropertyGroup> | ||
| </Project> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="ExcelDna.AddIn" version="0.33.9" targetFramework="net45" /> | ||
| <package id="ExcelDna.Integration" version="0.33.9" targetFramework="net45" /> | ||
| <package id="ExcelDna.AddIn" version="1.0.0" targetFramework="net45" /> | ||
| <package id="ExcelDna.Integration" version="1.0.0" targetFramework="net45" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="ExcelDna.Integration" version="0.33.9" targetFramework="net40" /> | ||
| <package id="ExcelDna.Integration" version="1.0.0" targetFramework="net40" /> | ||
| <package id="ExcelDna.Interop" version="14.0.1" targetFramework="net40" /> | ||
| </packages> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why so high? Maybe 1.1.0 for the next version (and 1.1.1 etc. for small updates during the 1.1.0 ExcelDna.Integration life?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure the ServerVersion and the AssemblyVersion can be kept in sync in the strong-name world? Then we might as well keep the assembly version fixed at 1.1? (or 1.1.1). I'm getting confused...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AssemblyVersionis1.1.0already. It seems thisServerVersionvariable went out of sync with theAssemblyVersion. So in this PR I'm bumping theAssemblyVersionto1.2.0and keepingServerVersionin sync...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd suggest we sync
ServerVersionwithAssemblyInformationalVersion(which is what gets translated toProductVersionat the end.The reason being that any modern build servers (such as Azure Pipelines) supports updating the
AssemblyInformationalVersionduring build and baking it into the compiled assembly... And to makeServerVersionget bumped it would take some scripting.If I understand correctly,
ServerVersionis just a custom metadata that is used to determine the highest version of the IntelliSense from all the available IntelliSense servers across all add-ins, so the number doesn't really matter much, as long as it's always higher than the previous release.