Skip to content

Commit 81870f3

Browse files
committed
Update Testbed project
1 parent 7b4d994 commit 81870f3

16 files changed

Lines changed: 207 additions & 15 deletions

File tree

src/Testbed/Classic/ClassicPluginsCS13/AccountGreetingPlugin.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public partial class AccountGreetingPlugin : IPlugin
1111
{
1212
[Dependency]
1313
IOrganizationService OrganizationService => Require<IOrganizationService>();
14-
14+
1515
public void Execute(IServiceProvider serviceProvider)
1616
{
1717
// Without Dependency Injection:
@@ -20,7 +20,6 @@ public void Execute(IServiceProvider serviceProvider)
2020
target["description"] = $"Welcome to Power Platform, {target["name"]}!";
2121

2222
// With Dependency Injection:
23-
2423
using var scope = CreateScope(serviceProvider);
2524
Target.Description = $"Welcome to Power Platform, {Target.Name}!";
2625
}

src/Testbed/Classic/ClassicPluginsCS13/AccountGreetingPlugin.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace XrmGenTest
1717
{
18-
[GeneratedCode("TemplatedCodeGenerator", "1.6.0.0")]
18+
[GeneratedCode("TemplatedCodeGenerator", "2.0.0.0")]
1919
public partial class AccountGreetingPlugin
2020
{
2121
/// <summary>

src/Testbed/Classic/ClassicPluginsCS13/AnnotationCreatePlugin.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace XrmGenTest
1717
{
18-
[GeneratedCode("TemplatedCodeGenerator", "1.6.0.0")]
18+
[GeneratedCode("TemplatedCodeGenerator", "2.0.0.0")]
1919
public partial class AnnotationCreatePlugin
2020
{
2121
/// <summary>

src/Testbed/Classic/ClassicPluginsCS13/ClassicPluginsCS13.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<ItemGroup>
6262
<Compile Include="AccountGreetingPlugin.cs">
6363
<Generator>XrmTools Plugin Code Generator</Generator>
64-
<IsXrmPlugin>True</IsXrmPlugin>
6564
<LastGenOutput>AccountGreetingPlugin.g.cs</LastGenOutput>
65+
<IsXrmPlugin>True</IsXrmPlugin>
6666
</Compile>
6767
<Compile Include="AccountGreetingPlugin.g.cs">
6868
<AutoGen>True</AutoGen>
@@ -135,7 +135,7 @@
135135
<PrivateAssets>all</PrivateAssets>
136136
</PackageReference>
137137
<PackageReference Include="XrmTools.Meta.Attributes">
138-
<Version>1.1.4</Version>
138+
<Version>1.2.0</Version>
139139
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
140140
<PrivateAssets>all</PrivateAssets>
141141
</PackageReference>

src/Testbed/Classic/ClassicPluginsCS73/ClassicPluginsCS73.csproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +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\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.props" Condition="Exists('..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -153,15 +154,17 @@
153154
</None>
154155
</ItemGroup>
155156
<ItemGroup>
156-
<Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.1.2\analyzers\dotnet\cs\XrmTools.Analyzers.CodeFixes.dll" />
157-
<Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.1.2\analyzers\dotnet\cs\XrmTools.Analyzers.dll" />
157+
<Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.2.0\analyzers\dotnet\cs\XrmTools.Analyzers.CodeFixes.dll" />
158+
<Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.2.0\analyzers\dotnet\cs\XrmTools.Analyzers.dll" />
159+
<Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.2.0\analyzers\dotnet\cs\XrmTools.Meta.Attributes.SourceGenerator.dll" />
158160
</ItemGroup>
159161
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
160-
<Import Project="..\..\packages\XrmTools.Meta.Attributes.1.1.2\build\XrmTools.Meta.Attributes.targets" Condition="Exists('..\..\packages\XrmTools.Meta.Attributes.1.1.2\build\XrmTools.Meta.Attributes.targets')" />
161162
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
162163
<PropertyGroup>
163164
<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>
164165
</PropertyGroup>
165-
<Error Condition="!Exists('..\..\packages\XrmTools.Meta.Attributes.1.1.2\build\XrmTools.Meta.Attributes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\XrmTools.Meta.Attributes.1.1.2\build\XrmTools.Meta.Attributes.targets'))" />
166+
<Error Condition="!Exists('..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.props'))" />
167+
<Error Condition="!Exists('..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.targets'))" />
166168
</Target>
169+
<Import Project="..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.targets" Condition="Exists('..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.targets')" />
167170
</Project>

src/Testbed/Classic/ClassicPluginsCS73/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
<package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
1313
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
1414
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
15-
<package id="XrmTools.Meta.Attributes" version="1.1.2" targetFramework="net462" developmentDependency="true" />
15+
<package id="XrmTools.Meta.Attributes" version="1.2.0" targetFramework="net462" developmentDependency="true" />
1616
</packages>

src/Testbed/Classic/MicrosoftSamplePlugin/MicrosoftSamplePlugin.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +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\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.props" Condition="Exists('..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -156,6 +157,9 @@
156157
<ItemGroup>
157158
<Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.1.2\analyzers\dotnet\cs\XrmTools.Analyzers.CodeFixes.dll" />
158159
<Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.1.2\analyzers\dotnet\cs\XrmTools.Analyzers.dll" />
160+
<Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.2.0\analyzers\dotnet\cs\XrmTools.Analyzers.CodeFixes.dll" />
161+
<Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.2.0\analyzers\dotnet\cs\XrmTools.Analyzers.dll" />
162+
<Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.2.0\analyzers\dotnet\cs\XrmTools.Meta.Attributes.SourceGenerator.dll" />
159163
</ItemGroup>
160164
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
161165
<Import Project="..\packages\XrmTools.Meta.Attributes.1.0.57\build\XrmTools.Meta.Attributes.targets" Condition="Exists('..\packages\XrmTools.Meta.Attributes.1.0.57\build\XrmTools.Meta.Attributes.targets')" />
@@ -164,7 +168,8 @@
164168
<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>
165169
</PropertyGroup>
166170
<Error Condition="!Exists('..\packages\XrmTools.Meta.Attributes.1.0.57\build\XrmTools.Meta.Attributes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\XrmTools.Meta.Attributes.1.0.57\build\XrmTools.Meta.Attributes.targets'))" />
167-
<Error Condition="!Exists('..\..\packages\XrmTools.Meta.Attributes.1.1.2\build\XrmTools.Meta.Attributes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\XrmTools.Meta.Attributes.1.1.2\build\XrmTools.Meta.Attributes.targets'))" />
171+
<Error Condition="!Exists('..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.props'))" />
172+
<Error Condition="!Exists('..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.targets'))" />
168173
</Target>
169-
<Import Project="..\..\packages\XrmTools.Meta.Attributes.1.1.2\build\XrmTools.Meta.Attributes.targets" Condition="Exists('..\..\packages\XrmTools.Meta.Attributes.1.1.2\build\XrmTools.Meta.Attributes.targets')" />
174+
<Import Project="..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.targets" Condition="Exists('..\..\packages\XrmTools.Meta.Attributes.1.2.0\build\XrmTools.Meta.Attributes.targets')" />
170175
</Project>

src/Testbed/Classic/MicrosoftSamplePlugin/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
<package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
1313
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
1414
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
15-
<package id="XrmTools.Meta.Attributes" version="1.1.2" targetFramework="net462" developmentDependency="true" />
15+
<package id="XrmTools.Meta.Attributes" version="1.2.0" targetFramework="net462" developmentDependency="true" />
1616
</packages>

src/Testbed/SdkStyle/SdkPluginsCS10/SdkPluginsCS10.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PackageReference Include="Microsoft.CrmSdk.CoreAssemblies" Version="9.0.2.*" PrivateAssets="All" />
2828
<PackageReference Include="Microsoft.PowerApps.MSBuild.Plugin" Version="1.*" PrivateAssets="All" />
2929
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.*" PrivateAssets="All" />
30-
<PackageReference Include="XrmTools.Meta.Attributes" Version="1.1.2">
30+
<PackageReference Include="XrmTools.Meta.Attributes" Version="1.2.0">
3131
<PrivateAssets>all</PrivateAssets>
3232
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3333
</PackageReference>

src/Testbed/Test/.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# msbuild output directories
4+
/bin
5+
/obj
6+
7+
# MSBuild Binary and Structured Log
8+
*.binlog

0 commit comments

Comments
 (0)