Skip to content

Commit 94f3313

Browse files
yagasoftyagasoft
committed
Fixed: assembly issues.
1 parent 268da69 commit 94f3313

39 files changed

Lines changed: 121 additions & 122 deletions

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DynamicsCrm-Template-based-Code-Generator-Plugin
22

3-
### Version: 1.0.0.3
3+
### Version: 1.0.0.4
44
---
55

66
An XrmToolBox plugin that can be used to generate Early-bound code from a CRM Schema using a customisable T4 Template.
@@ -29,6 +29,8 @@ The engine for this Plugin and the VS Extension is the same. The settings and T4
2929

3030
## Changes
3131

32+
#### _v1.0.0.4 (2020-08-27)_
33+
+ Fixed: assembly issues
3234
#### _v1.0.0.3 (2020-08-25)_
3335
+ Changed: updated package name
3436
#### _v1.0.0.1 (2020-08-24)_

‎TemplateCodeGeneratorPlugin/ILMerge.props‎

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

‎TemplateCodeGeneratorPlugin/ILMergeOrder.txt‎

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

‎TemplateCodeGeneratorPlugin/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.1")]
36-
[assembly: AssemblyFileVersion("1.0.0.1")]
35+
[assembly: AssemblyVersion("1.0.0.4")]
36+
[assembly: AssemblyFileVersion("1.0.0.4")]

‎TemplateCodeGeneratorPlugin/TemplateCodeGeneratorPlugin.csproj‎

Lines changed: 112 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props" Condition="Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props')" />
4-
<Import Project="..\packages\ILMerge.3.0.29\build\ILMerge.props" Condition="Exists('..\packages\ILMerge.3.0.29\build\ILMerge.props')" />
3+
<Import Project="..\packages\ILMerge.3.0.41\build\ILMerge.props" Condition="Exists('..\packages\ILMerge.3.0.41\build\ILMerge.props')" />
54
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
65
<PropertyGroup>
76
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -65,7 +64,7 @@
6564
</Reference>
6665
<Reference Include="Microsoft.VisualStudio.TextTemplating.Interfaces.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6766
<HintPath>..\packages\Microsoft.VisualStudio.TextTemplating.Interfaces.11.0.11.0.50728\lib\net45\Microsoft.VisualStudio.TextTemplating.Interfaces.11.0.dll</HintPath>
68-
<Private>False</Private>
67+
<Private>True</Private>
6968
</Reference>
7069
<Reference Include="Microsoft.Web.XmlTransform, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7170
<HintPath>..\packages\Microsoft.Web.Xdt.2.1.2\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
@@ -107,33 +106,71 @@
107106
<HintPath>..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>
108107
<Private>False</Private>
109108
</Reference>
110-
<Reference Include="PresentationFramework" />
109+
<Reference Include="PresentationFramework">
110+
<Private>False</Private>
111+
</Reference>
111112
<Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
112113
<HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
114+
<Private>True</Private>
115+
</Reference>
116+
<Reference Include="System">
117+
<Private>False</Private>
118+
</Reference>
119+
<Reference Include="System.Activities">
120+
<Private>False</Private>
121+
</Reference>
122+
<Reference Include="System.Activities.Presentation">
123+
<Private>False</Private>
124+
</Reference>
125+
<Reference Include="System.ComponentModel.Composition">
126+
<Private>False</Private>
127+
</Reference>
128+
<Reference Include="System.Configuration">
129+
<Private>False</Private>
130+
</Reference>
131+
<Reference Include="System.Core">
132+
<Private>False</Private>
133+
</Reference>
134+
<Reference Include="System.Data.Linq">
135+
<Private>False</Private>
136+
</Reference>
137+
<Reference Include="System.DirectoryServices">
138+
<Private>False</Private>
139+
</Reference>
140+
<Reference Include="System.DirectoryServices.AccountManagement">
141+
<Private>False</Private>
142+
</Reference>
143+
<Reference Include="System.Drawing">
144+
<Private>False</Private>
145+
</Reference>
146+
<Reference Include="System.IdentityModel">
147+
<Private>False</Private>
148+
</Reference>
149+
<Reference Include="System.Management">
150+
<Private>False</Private>
151+
</Reference>
152+
<Reference Include="System.Net">
113153
<Private>False</Private>
114154
</Reference>
115-
<Reference Include="System" />
116-
<Reference Include="System.Activities" />
117-
<Reference Include="System.Activities.Presentation" />
118-
<Reference Include="System.ComponentModel.Composition" />
119-
<Reference Include="System.Configuration" />
120-
<Reference Include="System.Core" />
121-
<Reference Include="System.Data.Linq" />
122-
<Reference Include="System.DirectoryServices" />
123-
<Reference Include="System.DirectoryServices.AccountManagement" />
124-
<Reference Include="System.Drawing" />
125-
<Reference Include="System.IdentityModel" />
126-
<Reference Include="System.Management" />
127-
<Reference Include="System.Net" />
128155
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
129156
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
130157
<Private>False</Private>
131158
</Reference>
132-
<Reference Include="System.Net.Http.WebRequest" />
133-
<Reference Include="System.Runtime" />
134-
<Reference Include="System.Runtime.Caching" />
135-
<Reference Include="System.Runtime.Serialization" />
136-
<Reference Include="System.Security" />
159+
<Reference Include="System.Net.Http.WebRequest">
160+
<Private>False</Private>
161+
</Reference>
162+
<Reference Include="System.Runtime">
163+
<Private>False</Private>
164+
</Reference>
165+
<Reference Include="System.Runtime.Caching">
166+
<Private>False</Private>
167+
</Reference>
168+
<Reference Include="System.Runtime.Serialization">
169+
<Private>False</Private>
170+
</Reference>
171+
<Reference Include="System.Security">
172+
<Private>False</Private>
173+
</Reference>
137174
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
138175
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
139176
<Private>False</Private>
@@ -150,19 +187,45 @@
150187
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
151188
<Private>False</Private>
152189
</Reference>
153-
<Reference Include="System.ServiceModel" />
154-
<Reference Include="System.ServiceModel.Web" />
155-
<Reference Include="System.Web" />
156-
<Reference Include="System.Web.Services" />
157-
<Reference Include="System.Windows.Forms" />
158-
<Reference Include="System.Workflow.Activities" />
159-
<Reference Include="System.Workflow.ComponentModel" />
160-
<Reference Include="System.Workflow.Runtime" />
161-
<Reference Include="System.Xml.Linq" />
162-
<Reference Include="System.Data.DataSetExtensions" />
163-
<Reference Include="Microsoft.CSharp" />
164-
<Reference Include="System.Data" />
165-
<Reference Include="System.Xml" />
190+
<Reference Include="System.ServiceModel">
191+
<Private>False</Private>
192+
</Reference>
193+
<Reference Include="System.ServiceModel.Web">
194+
<Private>False</Private>
195+
</Reference>
196+
<Reference Include="System.Web">
197+
<Private>False</Private>
198+
</Reference>
199+
<Reference Include="System.Web.Services">
200+
<Private>False</Private>
201+
</Reference>
202+
<Reference Include="System.Windows.Forms">
203+
<Private>False</Private>
204+
</Reference>
205+
<Reference Include="System.Workflow.Activities">
206+
<Private>False</Private>
207+
</Reference>
208+
<Reference Include="System.Workflow.ComponentModel">
209+
<Private>False</Private>
210+
</Reference>
211+
<Reference Include="System.Workflow.Runtime">
212+
<Private>False</Private>
213+
</Reference>
214+
<Reference Include="System.Xml.Linq">
215+
<Private>False</Private>
216+
</Reference>
217+
<Reference Include="System.Data.DataSetExtensions">
218+
<Private>False</Private>
219+
</Reference>
220+
<Reference Include="Microsoft.CSharp">
221+
<Private>False</Private>
222+
</Reference>
223+
<Reference Include="System.Data">
224+
<Private>False</Private>
225+
</Reference>
226+
<Reference Include="System.Xml">
227+
<Private>False</Private>
228+
</Reference>
166229
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
167230
<HintPath>..\packages\DockPanelSuite.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
168231
<Private>False</Private>
@@ -212,7 +275,6 @@
212275
<ItemGroup>
213276
<None Include="app.config" />
214277
<None Include="buildscripts\publish-nuget-packages.ps1" />
215-
<None Include="ILMerge.props" />
216278
<None Include="packages.config" />
217279
<None Include="TemplateCodeGeneratorPlugin.nuspec">
218280
<SubType>Designer</SubType>
@@ -235,20 +297,24 @@
235297
</None>
236298
</ItemGroup>
237299
<ItemGroup>
238-
<Content Include="ILMergeOrder.txt" />
239300
<Content Include="nuget-access-key.txt" />
240301
</ItemGroup>
241302
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
242303
<PropertyGroup>
243-
<PostBuildEvent>IF "$(ConfigurationName)" == "Debug" (
244-
IF NOT EXIST "$(SolutionDir)XrmToolBox\Plugins" mkdir "$(SolutionDir)XrmToolBox\Plugins"
245-
copy /Y Yagasoft.TemplateCodeGeneratorPlugin.dll "$(SolutionDir)XrmToolBox\Plugins"
246-
copy /Y Yagasoft.TemplateCodeGeneratorPlugin.pdb "$(SolutionDir)XrmToolBox\Plugins"
304+
<PostBuildEvent>IF NOT EXIST "$(SolutionDir)XrmToolBox\Plugins" mkdir "$(SolutionDir)XrmToolBox\Plugins"
305+
306+
IF "$(ConfigurationName)" == "Debug" (
307+
copy /Y $(TargetName).pdb "$(SolutionDir)XrmToolBox\Plugins"
247308
)
309+
248310
IF "$(ConfigurationName)" == "Release" (
311+
$(SolutionDir)packages\ILMerge.3.0.41\tools\net452\ILMerge.exe /out:$(TargetFileName) "$(TargetDir)*.dll" /target:library /wildcards /ndebug /lib:"$(SolutionDir)lib\ILMerge" /lib:"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\PrivateAssemblies" /targetplatform:v4,"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2" /attr:"$(TargetPath)"
249312
$(SolutionDir)lib/nuget.exe pack $(ProjectDir)\TemplateCodeGeneratorPlugin.nuspec
250313
copy /Y "$(TargetDir)*.nupkg" "C:\Nuget.Local\"
251-
)</PostBuildEvent>
314+
)
315+
316+
copy /Y $(TargetFileName) "$(SolutionDir)XrmToolBox\Plugins"
317+
</PostBuildEvent>
252318
</PropertyGroup>
253319
<PropertyGroup>
254320
<PreBuildEvent>del "$(TargetDir)*.nupkg"</PreBuildEvent>
@@ -257,9 +323,10 @@ IF "$(ConfigurationName)" == "Release" (
257323
<PropertyGroup>
258324
<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>
259325
</PropertyGroup>
260-
<Error Condition="!Exists('..\packages\ILMerge.3.0.29\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.29\build\ILMerge.props'))" />
261-
<Error Condition="!Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props'))" />
326+
<Error Condition="!Exists('..\packages\ILMerge.3.0.41\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.41\build\ILMerge.props'))" />
327+
<!--<Error Condition="!Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props'))" />
262328
<Error Condition="!Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets'))" />
329+
<Error Condition="!Exists('..\packages\ILMerge.3.0.41\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.41\build\ILMerge.props'))" />-->
263330
</Target>
264-
<Import Project="..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets" Condition="Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets')" />
331+
<!--<Import Project="..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets" Condition="Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets')" />-->
265332
</Project>

‎TemplateCodeGeneratorPlugin/TemplateCodeGeneratorPlugin.nuspec‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<metadata>
55
<id>Template-based-CRM-Code-Generator-Plugin</id>
66
<title>Early-bound Template-based Code Generator</title>
7-
<version>1.0.0.3</version>
7+
<version>1.0.0.4</version>
88
<authors>Ahmed Elsawalhy</authors>
99
<owners>Ahmed Elsawalhy</owners>
1010
<projectUrl>https://github.com/yagasoft/DynamicsCrm-Template-based-Code-Generator-Plugin</projectUrl>
@@ -16,6 +16,8 @@
1616
<copyright>Copyright 2020 Ahmed Elsawalhy</copyright>
1717
<tags>XrmToolBox plugin,tool,CRM,Dynamics,365,yagasoft,xrm,early,bound,code,generate,generator,t4,template</tags>
1818
<releaseNotes>
19+
* 1.0.0.4
20+
Fixed: assembly issues
1921
* 1.0.0.3
2022
Changed: updated package name
2123
* 1.0.0.1

‎TemplateCodeGeneratorPlugin/packages.config‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="DockPanelSuite" version="3.0.6" targetFramework="net462" />
44
<package id="DockPanelSuite.ThemeVS2015" version="3.0.6" targetFramework="net462" />
5-
<package id="ILMerge" version="3.0.29" targetFramework="net462" />
5+
<package id="ILMerge" version="3.0.41" targetFramework="net462" />
66
<package id="jacobslusser.ScintillaNET" version="3.6.3" targetFramework="net462" />
77
<package id="Microsoft.CrmSdk.CoreAssemblies" version="9.0.2.21" targetFramework="net462" />
88
<package id="Microsoft.CrmSdk.Deployment" version="9.0.2.21" targetFramework="net462" />
@@ -15,7 +15,6 @@
1515
<package id="Microsoft.VisualStudio.TextTemplating.Interfaces.10.0" version="10.0.30320" targetFramework="net462" />
1616
<package id="Microsoft.VisualStudio.TextTemplating.Interfaces.11.0" version="11.0.50728" targetFramework="net462" />
1717
<package id="Microsoft.Web.Xdt" version="2.1.2" targetFramework="net462" />
18-
<package id="MSBuild.ILMerge.Task" version="1.1.3" targetFramework="net462" />
1918
<package id="MscrmTools.Xrm.Connection" version="1.2020.1.29" targetFramework="net462" />
2019
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net462" />
2120
<package id="NuGet.Core" version="2.14.0" targetFramework="net462" />

‎lib/ILMerge/McTools.Xrm.Connection.WinForms.dll‎

263 KB
Binary file not shown.

‎lib/ILMerge/McTools.Xrm.Connection.dll‎

54 KB
Binary file not shown.

‎lib/ILMerge/Microsoft.CodeAnalysis.CSharp.dll‎

5.62 MB
Binary file not shown.

0 commit comments

Comments
 (0)