Skip to content

Commit f5e5d4c

Browse files
sgiffinlcdsgiffinlcd
committed
160 SDK update
1 parent e8c6dfb commit f5e5d4c

26 files changed

+574
-23
lines changed

‎Src/CodeFactoryForWindows/CodeFactory.Packager.WinVs/CodeFactory.Packager.WinVs.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<HintPath>..\packages\CodeFactory.2.23151.1-PreRelease\lib\netstandard2.0\CodeFactory.dll</HintPath>
4040
</Reference>
4141
<Reference Include="CodeFactory.WinVs, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6f4b2344c7d1e83a, processorArchitecture=MSIL">
42-
<HintPath>..\packages\CodeFactory.WinVs.2.23158.1-PreRelease\lib\netstandard2.0\CodeFactory.WinVs.dll</HintPath>
42+
<HintPath>..\packages\CodeFactory.WinVs.2.23160.1-PreRelease\lib\netstandard2.0\CodeFactory.WinVs.dll</HintPath>
4343
</Reference>
4444
<Reference Include="MessagePack, Version=2.5.0.0, Culture=neutral, PublicKeyToken=b4a0369545f0a1be, processorArchitecture=MSIL">
4545
<HintPath>..\packages\MessagePack.2.5.108\lib\netstandard2.0\MessagePack.dll</HintPath>

‎Src/CodeFactoryForWindows/CodeFactory.Packager.WinVs/CodeFactoryWinVsSDK.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd" >
33
<metadata>
44
<id>CodeFactory.WinVs.SDK</id>
5-
<version>2.23158.1-PreRelease</version>
5+
<version>2.23160.1-PreRelease</version>
66
<title>CodeFactory Software Development Kit for Visual Studio - Windows</title>
77
<authors>CodeFactory, LLC.</authors>
88
<owners>CodeFactory, LLC.</owners>
@@ -24,7 +24,7 @@
2424
<tags>Factory Automation</tags>
2525
<dependencies>
2626
<dependency id="CodeFactory" version="2.23151.1-PreRelease"/>
27-
<dependency id="CodeFactory.WinVs" version="2.23158.1-PreRelease"/>
27+
<dependency id="CodeFactory.WinVs" version="2.23160.1-PreRelease"/>
2828
<dependency id="CodeFactory.WinVs.Wpf" version="2.23151.1-PreRelease"/>
2929
</dependencies>
3030
<icon>CFLogo128.png</icon>

‎Src/CodeFactoryForWindows/CodeFactory.Packager.WinVs/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
[assembly: AssemblyVersion("2.0.0.0")]
36-
[assembly: AssemblyFileVersion("2.23158.0.1")]
36+
[assembly: AssemblyFileVersion("2.23160.0.1")]

‎Src/CodeFactoryForWindows/CodeFactory.Packager.WinVs/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="CodeFactory" version="2.23151.1-PreRelease" targetFramework="net48" />
4-
<package id="CodeFactory.WinVs" version="2.23158.1-PreRelease" targetFramework="net48" />
4+
<package id="CodeFactory.WinVs" version="2.23160.1-PreRelease" targetFramework="net48" />
55
<package id="MessagePack" version="2.5.108" targetFramework="net48" />
66
<package id="MessagePack.Annotations" version="2.5.108" targetFramework="net48" />
77
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net48" />

‎Src/CodeFactoryForWindows/CodeFactory.WinVs/CodeFactory.WinVs.csproj‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<SignAssembly>True</SignAssembly>
66
<AssemblyOriginatorKeyFile>C:\github\codefactoryllc\CodeFactoryRuntimeWinVs\src\CodeFactory.Runtime.WinVs-Solution\CodeFactory.Runtime.WinVs\CFSigner.snk</AssemblyOriginatorKeyFile>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
8-
<Version>2.23158.1-PreRelease</Version>
8+
<Version>2.23160.1-PreRelease</Version>
99
<Authors>CodeFactory, LLC.</Authors>
1010
<Company>CodeFactory, LLC.</Company>
1111
<Product>CodeFactory Base Library</Product>
@@ -16,9 +16,17 @@
1616
<IncludeSymbols>False</IncludeSymbols>
1717
<Title>CodeFactory API for Visual Studio - Windows </Title>
1818
<AssemblyVersion>2.0.0.0</AssemblyVersion>
19-
<FileVersion>2.23158.0.1</FileVersion>
19+
<FileVersion>2.23160.0.1</FileVersion>
2020
<PackageIcon>CFLogo128.png</PackageIcon>
21-
<PackageReleaseNotes>Pre release of CodeFactory for Windows Version 2.0. No documentation or site access at this time.</PackageReleaseNotes>
21+
<PackageReleaseNotes>
22+
Release Updates for 2.23160.0.1
23+
24+
Source Manager Add Source Changes
25+
- The roll up order has been fixed so to pass through constructor and field positions before the top of the file.
26+
27+
C# Generation Additions
28+
- GenerateCSharpTypeName
29+
</PackageReleaseNotes>
2230
<GenerateDocumentationFile>True</GenerateDocumentationFile>
2331
</PropertyGroup>
2432

‎Src/CodeFactoryForWindows/CodeFactory.WinVs/Loader/SdkSupport.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ public static class SdkSupport
2323
/// <summary>
2424
/// The maximum version of the SDK that can be loaded and used.
2525
/// </summary>
26-
public const string MaxVersion = "2.23158.0.1";
26+
public const string MaxVersion = "2.23160.0.1";
2727

2828
/// <summary>
2929
/// The target version of the NuGet package this SDK is deployed from.
3030
/// </summary>
31-
public const string NuGetSdkVersion = "2.23158.1-PreRelease";
31+
public const string NuGetSdkVersion = "2.23160.1-PreRelease";
3232

3333
/// <summary>
3434
/// The name of the assembly type for the CodeFactory SDK version attribute.

‎Src/CodeFactoryForWindows/CodeFactory.WinVs/Models/CSharp/Builder/SourceContainerManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ public async Task PropertiesAddBeforeAsync(string syntax)
381381
}
382382
else
383383
{
384-
await this.ContainerAddToBeginningAsync(syntax);
384+
await this.ConstructorsAddAfterAsync(syntax);
385385
}
386386

387387
}
@@ -413,7 +413,7 @@ public async Task PropertiesAddAfterAsync(string syntax)
413413
}
414414
else
415415
{
416-
await this.ContainerAddToBeginningAsync(syntax);
416+
await this.ConstructorsAddAfterAsync(syntax);
417417
}
418418
}
419419

‎Src/CodeFactoryForWindows/CodeFactory.WinVs/Models/CSharp/GenerateCSharpCsContainerExtensions.cs‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+

2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace CodeFactory.WinVs.Models.CSharp
6+
{
7+
/// <summary>
8+
/// Extension methods that support the generation of source in the C# language from the <see cref="CsContainer"/> model.
9+
/// </summary>
10+
public static class GenerateCSharpCsContainerExtensions
11+
{
12+
/// <summary>
13+
/// Generates the C# type name.
14+
/// </summary>
15+
/// <param name="source">Source container to generate the type name from.</param>
16+
/// <param name="manager">Optional parameter that contains all the using statements from the source code, when used will replace namespaces on type definition in code.</param>
17+
/// <param name="mappedNamespaces">Optional parameter that provides namespaces to be mapped to.</param>
18+
/// <returns>The formatted type name.</returns>
19+
public static string GenerateCSharpTypeName(this CsContainer source, NamespaceManager manager = null, List<MapNamespace> mappedNamespaces = null)
20+
{
21+
if (source == null || !source.IsLoaded) return null;
22+
23+
StringBuilder stringBuilder = new StringBuilder();
24+
NamespaceManager nsManager = manager ?? new NamespaceManager();
25+
string str = nsManager.AppendingNamespace(source.Namespace);
26+
stringBuilder.Append(str == null ? source.Name : str + "." + source.Name);
27+
if (source.IsGeneric)
28+
stringBuilder.Append(source.GenericParameters.GenerateCSharpGenericParametersSignature(manager, mappedNamespaces));
29+
return stringBuilder.ToString();
30+
}
31+
}
32+
}

‎docs/api/CodeFactory.WinVs.Loader.SdkSupport.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ <h4 id="CodeFactory_WinVs_Loader_SdkSupport_MaxVersion" data-uid="CodeFactory.Wi
191191
<div class="markdown level1 conceptual"></div>
192192
<h5 class="declaration">Declaration</h5>
193193
<div class="codewrapper">
194-
<pre><code class="lang-csharp hljs">public const string MaxVersion = &quot;2.23158.0.1&quot;</code></pre>
194+
<pre><code class="lang-csharp hljs">public const string MaxVersion = &quot;2.23160.0.1&quot;</code></pre>
195195
</div>
196196
<h5 class="fieldValue">Field Value</h5>
197197
<table class="table table-bordered table-condensed">
@@ -237,7 +237,7 @@ <h4 id="CodeFactory_WinVs_Loader_SdkSupport_NuGetSdkVersion" data-uid="CodeFacto
237237
<div class="markdown level1 conceptual"></div>
238238
<h5 class="declaration">Declaration</h5>
239239
<div class="codewrapper">
240-
<pre><code class="lang-csharp hljs">public const string NuGetSdkVersion = &quot;2.23158.1-PreRelease&quot;</code></pre>
240+
<pre><code class="lang-csharp hljs">public const string NuGetSdkVersion = &quot;2.23160.1-PreRelease&quot;</code></pre>
241241
</div>
242242
<h5 class="fieldValue">Field Value</h5>
243243
<table class="table table-bordered table-condensed">

‎docs/api/CodeFactory.WinVs.Models.CSharp.CsClass.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,9 @@ <h3 id="extensionmethods">Extension Methods</h3>
759759
<div>
760760
<a class="xref" href="CodeFactory.WinVs.Models.CSharp.CsContainerExtensions.html#CodeFactory_WinVs_Models_CSharp_CsContainerExtensions_GetComparisonMembers_CodeFactory_WinVs_Models_CSharp_CsContainer_CodeFactory_WinVs_Models_CSharp_MemberComparisonType_System_Collections_Generic_List_CodeFactory_WinVs_Models_CSharp_MapNamespace__">CsContainerExtensions.GetComparisonMembers(CsContainer, MemberComparisonType, List&lt;MapNamespace&gt;)</a>
761761
</div>
762+
<div>
763+
<a class="xref" href="CodeFactory.WinVs.Models.CSharp.GenerateCSharpCsContainerExtensions.html#CodeFactory_WinVs_Models_CSharp_GenerateCSharpCsContainerExtensions_GenerateCSharpTypeName_CodeFactory_WinVs_Models_CSharp_CsContainer_CodeFactory_WinVs_Models_CSharp_NamespaceManager_System_Collections_Generic_List_CodeFactory_WinVs_Models_CSharp_MapNamespace__">GenerateCSharpCsContainerExtensions.GenerateCSharpTypeName(CsContainer, NamespaceManager, List&lt;MapNamespace&gt;)</a>
764+
</div>
762765
<div>
763766
<a class="xref" href="CodeFactory.WinVs.Models.CSharp.GenerateCSharpDocumentationExtensions.html#CodeFactory_WinVs_Models_CSharp_GenerateCSharpDocumentationExtensions_GenerateCSharpXmlDocumentation_CodeFactory_WinVs_Models_CSharp_IDocumentation_System_Int32_">GenerateCSharpDocumentationExtensions.GenerateCSharpXmlDocumentation(IDocumentation, int)</a>
764767
</div>

0 commit comments

Comments
 (0)