Skip to content

Commit c65cf20

Browse files
MarkusHorstmannMarkusHorstmann
authored
Thing matcher OPC Contract project rename (#29)
1 parent 72fc5d5 commit c65cf20

File tree

7 files changed

+17
-18
lines changed

7 files changed

+17
-18
lines changed

‎Directory.Build.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
SPDX-FileCopyrightText: 2009-2020 TRUMPF Laser GmbH, authors: C-Labs
2+
SPDX-FileCopyrightText: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
33
SPDX-License-Identifier: MPL-2.0
44
-->
55
<Project>
@@ -48,7 +48,7 @@
4848
<!-- Package to Project replacement: Based on https://github.com/dotnet/sdk/issues/1151#issuecomment-459275750 -->
4949
<PropertyGroup>
5050
<ReplacePackageReferences Condition="'$(ReplacePackageReferences)' == ''">true</ReplacePackageReferences>
51-
<PackageReferenceFilter Condition="'$(PackageReferenceFilter)' == ''">C-DEngine;CDMyNMIHtml5RT</PackageReferenceFilter> <!-- Performance optimization: only look at certain package references -->
51+
<PackageReferenceFilter Condition="'$(PackageReferenceFilter)' == ''"></PackageReferenceFilter> <!-- Performance optimization: only look at certain package references -->
5252
<ReplaceProjectReferences Condition="'$(ReplaceProjectReferences)' == ''">false</ReplaceProjectReferences>
5353
</PropertyGroup>
5454

‎src/Libraries/185 - SenderAndReceiverBase/TheEventConverters/EventConverters.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public static string GetDisplayNamesAsSemicolonSeperatedList()
264264
public class JSonThingEventConverter : IEventConverter
265265
{
266266
public string DisplayName { get; set; }
267-
public Func<TheThing, TheThingStore, bool> ApplyUpdateCallback { get; internal set; }
267+
public Func<TheThing, TheThingStore, bool> ApplyUpdateCallback { get; set; }
268268

269269
public override IEnumerable<object> GetEventData(IEnumerable<TheThingStore> thingUpdates, IThingToConvert senderThing, int maxEventDataSize, bool doNotBatchEvents)
270270
{

‎src/Libraries/185 - SenderAndReceiverBase/TheEventConverters/cdeEventConvertersShared.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323

2424
<ItemGroup>
2525
<Compile Remove="*.cs" />
26-
<Content Include="**\*.cs" buildAction="Compile" PackagePath="content\Shared\$(PackageId)"/>
27-
<Content Include="**\*.cs" buildAction="Compile" PackagePath ="contentFiles\cs\netstandard2.0\Shared\$(PackageId)"/>
28-
<Content Include="**\*.cs" buildAction="Compile" PackagePath ="contentFiles\cs\net45\Shared\$(PackageId)"/>
29-
<Content Include="**\*.cs" buildAction="Compile" PackagePath ="contentFiles\cs\net35\Shared\$(PackageId)"/>
30-
<Content Include="**\*.cs" buildAction="Compile" PackagePath ="contentFiles\cs\net4\Shared\$(PackageId)"/>
26+
<Content Include="**\*.cs" buildAction="Compile" PackagePath="content\Shared\$(PackageId)" />
27+
<Content Include="**\*.cs" buildAction="Compile" PackagePath="contentFiles\cs\netstandard2.0\Shared\$(PackageId)" />
28+
<Content Include="**\*.cs" buildAction="Compile" PackagePath="contentFiles\cs\net45\Shared\$(PackageId)" />
29+
<Content Include="**\*.cs" buildAction="Compile" PackagePath="contentFiles\cs\net35\Shared\$(PackageId)" />
30+
<Content Include="**\*.cs" buildAction="Compile" PackagePath="contentFiles\cs\net4\Shared\$(PackageId)" />
3131

3232
<Compile Include="*.cs" />
3333
<Content Remove="obj\**" />
@@ -52,7 +52,7 @@
5252
</ItemGroup>
5353

5454
<ItemGroup>
55-
<ProjectReference Include="..\..\..\MessageContracts\078 - CDMyOPCUAClient\APIs\MyOPCUAClientContracts\cdeOPCUAClientContracts.csproj" />
55+
<ProjectReference Include="..\..\..\MessageContracts\078 - CDMyOPCUAClient\APIs\MyOPCUAClientContracts\cdeOPCUAClientContractsShared.csproj" />
5656
<ProjectReference Include="..\TheConnectionBase\cdeConnectionBaseShared.csproj" />
5757
</ItemGroup>
5858

‎src/Libraries/185 - SenderAndReceiverBase/TheSenderBase/cdeSenderBaseShared.csproj

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323

2424
<ItemGroup>
2525
<Compile Remove="**\*.cs" />
26-
<Content Include="**\*.cs" buildAction="Compile" PackagePath="content\Shared\$(PackageId)"/>
27-
<Content Include="**\*.cs" buildAction="Compile" PackagePath ="contentFiles\cs\netstandard2.0\Shared\$(PackageId)"/>
28-
<Content Include="**\*.cs" buildAction="Compile" PackagePath ="contentFiles\cs\net45\Shared\$(PackageId)"/>
29-
<Content Include="**\*.cs" buildAction="Compile" PackagePath ="contentFiles\cs\net35\Shared\$(PackageId)"/>
30-
<Content Include="**\*.cs" buildAction="Compile" PackagePath ="contentFiles\cs\net4\Shared\$(PackageId)"/>
26+
<Content Include="**\*.cs" buildAction="Compile" PackagePath="content\Shared\$(PackageId)" />
27+
<Content Include="**\*.cs" buildAction="Compile" PackagePath="contentFiles\cs\netstandard2.0\Shared\$(PackageId)" />
28+
<Content Include="**\*.cs" buildAction="Compile" PackagePath="contentFiles\cs\net45\Shared\$(PackageId)" />
29+
<Content Include="**\*.cs" buildAction="Compile" PackagePath="contentFiles\cs\net35\Shared\$(PackageId)" />
30+
<Content Include="**\*.cs" buildAction="Compile" PackagePath="contentFiles\cs\net4\Shared\$(PackageId)" />
3131

3232
<Compile Include="**\*.cs" />
3333
<Content Remove="obj\**" />
@@ -59,9 +59,8 @@
5959

6060
<ItemGroup>
6161
<ProjectReference Include="..\..\..\MessageContracts\144 - TheCommonMessageContracts\TheCommonMessageContracts\cdeCommonMessageContractsShared.csproj" />
62-
<ProjectReference Include="..\TheConnectionBase\cdeConnectionBaseShared.csproj" />
6362
<ProjectReference Include="..\TheEventConverters\cdeEventConvertersShared.csproj" />
64-
<ProjectReference Include="..\TheThingMatcher\cdeThingMatcher.csproj" />
63+
<ProjectReference Include="..\TheThingMatcher\cdeThingMatcherShared.csproj" />
6564
</ItemGroup>
6665

6766
</Project>

‎src/Libraries/185 - SenderAndReceiverBase/TheThingMatcher/cdeThingMatcher.csproj renamed to ‎src/Libraries/185 - SenderAndReceiverBase/TheThingMatcher/cdeThingMatcherShared.csproj

File renamed without changes.

‎src/MessageContracts/078 - CDMyOPCUAClient/APIs/MyOPCUAClientContracts/cdeOPCUAClientContracts.csproj renamed to ‎src/MessageContracts/078 - CDMyOPCUAClient/APIs/MyOPCUAClientContracts/cdeOPCUAClientContractsShared.csproj

File renamed without changes.

‎src/cdeSDK.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Readme", "_Readme", "{9CEE
7070
EndProject
7171
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cdeOPCUAClientAPI", "MessageContracts\078 - CDMyOPCUAClient\APIs\MyOPCUAClientAPI\cdeOPCUAClientAPI.csproj", "{37F9AF8F-D273-4A2B-972A-957E045BD4ED}"
7272
EndProject
73-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cdeOPCUAClientContracts", "MessageContracts\078 - CDMyOPCUAClient\APIs\MyOPCUAClientContracts\cdeOPCUAClientContracts.csproj", "{66D00BE3-11EF-4C7F-8643-80EFA08BE3AF}"
73+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cdeOPCUAClientContractsShared", "MessageContracts\078 - CDMyOPCUAClient\APIs\MyOPCUAClientContracts\cdeOPCUAClientContractsShared.csproj", "{66D00BE3-11EF-4C7F-8643-80EFA08BE3AF}"
7474
EndProject
7575
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TheConnectionBase", "Libraries\185 - SenderAndReceiverBase\TheConnectionBase\TheConnectionBase.shproj", "{9C8CC825-09B6-4320-A34B-22029F085012}"
7676
EndProject
@@ -94,7 +94,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cdeSenderBaseShared", "Libr
9494
EndProject
9595
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SenderAndReceiverBase", "SenderAndReceiverBase", "{E5DC19DA-228B-4F0E-9CF4-D3C60A6C2B62}"
9696
EndProject
97-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cdeThingMatcher", "Libraries\185 - SenderAndReceiverBase\TheThingMatcher\cdeThingMatcher.csproj", "{0F2F7A87-9683-4E2B-BDD8-702132C3C9A8}"
97+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cdeThingMatcherShared", "Libraries\185 - SenderAndReceiverBase\TheThingMatcher\cdeThingMatcherShared.csproj", "{0F2F7A87-9683-4E2B-BDD8-702132C3C9A8}"
9898
EndProject
9999
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{F32A0417-74E9-4185-9538-DA83B59F7124}"
100100
EndProject

0 commit comments

Comments
 (0)