Better plugin file detection and safer plugin registration by prompting the user

src/Testbed/Classic/ClassicPluginsCS13/AccountGreetingPlugin.cs

@@ -11,7 +11,7 @@ public partial class AccountGreetingPlugin : IPlugin
 {
     [Dependency]
     IOrganizationService OrganizationService => Require<IOrganizationService>();
-    
+
     public void Execute(IServiceProvider serviceProvider)
     {
         // Without Dependency Injection:
@@ -20,7 +20,6 @@ public void Execute(IServiceProvider serviceProvider)
         target["description"] = $"Welcome to Power Platform, {target["name"]}!";
 
         // With Dependency Injection:
-
         using var scope = CreateScope(serviceProvider);
         Target.Description = $"Welcome to Power Platform, {Target.Name}!";
     }

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

@@ -15,7 +15,7 @@
 
 namespace XrmGenTest
 {
-    [GeneratedCode("TemplatedCodeGenerator", "1.6.0.0")]
+    [GeneratedCode("TemplatedCodeGenerator", "2.0.0.0")]
     public partial class AccountGreetingPlugin
     {
         /// <summary>

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

@@ -15,7 +15,7 @@
 
 namespace XrmGenTest
 {
-    [GeneratedCode("TemplatedCodeGenerator", "1.6.0.0")]
+    [GeneratedCode("TemplatedCodeGenerator", "2.0.0.0")]
     public partial class AnnotationCreatePlugin
     {
         /// <summary>

src/Testbed/Classic/ClassicPluginsCS13/ClassicPluginsCS13.csproj

@@ -61,8 +61,8 @@
   <ItemGroup>
     <Compile Include="AccountGreetingPlugin.cs">
       <Generator>XrmTools Plugin Code Generator</Generator>
-      <IsXrmPlugin>True</IsXrmPlugin>
       <LastGenOutput>AccountGreetingPlugin.g.cs</LastGenOutput>
+      <IsXrmPlugin>True</IsXrmPlugin>
     </Compile>
     <Compile Include="AccountGreetingPlugin.g.cs">
       <AutoGen>True</AutoGen>
@@ -135,7 +135,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="XrmTools.Meta.Attributes">
-      <Version>1.1.4</Version>
+      <Version>1.2.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/Testbed/Classic/ClassicPluginsCS73/ClassicPluginsCS73.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <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')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -153,15 +154,17 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.1.2\analyzers\dotnet\cs\XrmTools.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.1.2\analyzers\dotnet\cs\XrmTools.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.2.0\analyzers\dotnet\cs\XrmTools.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.2.0\analyzers\dotnet\cs\XrmTools.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.2.0\analyzers\dotnet\cs\XrmTools.Meta.Attributes.SourceGenerator.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <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')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <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>
     </PropertyGroup>
-    <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'))" />
+    <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'))" />
+    <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'))" />
   </Target>
+  <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')" />
 </Project>

src/Testbed/Classic/ClassicPluginsCS73/packages.config

@@ -12,5 +12,5 @@
   <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
-  <package id="XrmTools.Meta.Attributes" version="1.1.2" targetFramework="net462" developmentDependency="true" />
+  <package id="XrmTools.Meta.Attributes" version="1.2.0" targetFramework="net462" developmentDependency="true" />
 </packages>

src/Testbed/Classic/MicrosoftSamplePlugin/MicrosoftSamplePlugin.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <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')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -156,6 +157,9 @@
   <ItemGroup>
     <Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.1.2\analyzers\dotnet\cs\XrmTools.Analyzers.CodeFixes.dll" />
     <Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.1.2\analyzers\dotnet\cs\XrmTools.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.2.0\analyzers\dotnet\cs\XrmTools.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.2.0\analyzers\dotnet\cs\XrmTools.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\XrmTools.Meta.Attributes.1.2.0\analyzers\dotnet\cs\XrmTools.Meta.Attributes.SourceGenerator.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <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 @@
       <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>
     </PropertyGroup>
     <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'))" />
-    <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'))" />
+    <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'))" />
+    <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'))" />
   </Target>
-  <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')" />
+  <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')" />
 </Project>

src/Testbed/Classic/MicrosoftSamplePlugin/packages.config

@@ -12,5 +12,5 @@
   <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
-  <package id="XrmTools.Meta.Attributes" version="1.1.2" targetFramework="net462" developmentDependency="true" />
+  <package id="XrmTools.Meta.Attributes" version="1.2.0" targetFramework="net462" developmentDependency="true" />
 </packages>

src/Testbed/SdkStyle/SdkPluginsCS10/SdkPluginsCS10.csproj

@@ -27,7 +27,7 @@
     <PackageReference Include="Microsoft.CrmSdk.CoreAssemblies" Version="9.0.2.*" PrivateAssets="All" />
     <PackageReference Include="Microsoft.PowerApps.MSBuild.Plugin" Version="1.*" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.*" PrivateAssets="All" />
-    <PackageReference Include="XrmTools.Meta.Attributes" Version="1.1.2">
+    <PackageReference Include="XrmTools.Meta.Attributes" Version="1.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

src/Testbed/Test/.gitignore

@@ -0,0 +1,8 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# msbuild output directories
+/bin
+/obj
+
+# MSBuild Binary and Structured Log
+*.binlog

src/Testbed/Test/Test.cdsproj

@@ -0,0 +1,5 @@
+<Project Sdk="AlbanianXrm.CDSProj.Sdk/1.0.11">
+  <ItemGroup>
+    <ProjectReference Include="..\Classic\ClassicPluginsCS13\ClassicPluginsCS13.csproj" />
+  </ItemGroup>
+</Project>

src/Testbed/Test/src/Entities/Account/Entity.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Name LocalizedName="Account" OriginalName="">Account</Name>
+  <EntityInfo>
+    <entity Name="Account">
+      <attributes>
+        <attribute PhysicalName="rn_SuggestedFollowup">
+          <Type>datetime</Type>
+          <Name>rn_suggestedfollowup</Name>
+          <LogicalName>rn_suggestedfollowup</LogicalName>
+          <RequiredLevel>none</RequiredLevel>
+          <DisplayMask>ValidForAdvancedFind|ValidForForm|ValidForGrid</DisplayMask>
+          <ImeMode>auto</ImeMode>
+          <ValidForUpdateApi>1</ValidForUpdateApi>
+          <ValidForReadApi>1</ValidForReadApi>
+          <ValidForCreateApi>1</ValidForCreateApi>
+          <IsCustomField>1</IsCustomField>
+          <IsAuditEnabled>1</IsAuditEnabled>
+          <IsSecured>0</IsSecured>
+          <IntroducedVersion>1.0</IntroducedVersion>
+          <IsCustomizable>1</IsCustomizable>
+          <IsRenameable>1</IsRenameable>
+          <CanModifySearchSettings>1</CanModifySearchSettings>
+          <CanModifyRequirementLevelSettings>1</CanModifyRequirementLevelSettings>
+          <CanModifyAdditionalSettings>1</CanModifyAdditionalSettings>
+          <SourceType>0</SourceType>
+          <IsGlobalFilterEnabled>0</IsGlobalFilterEnabled>
+          <IsSortableEnabled>0</IsSortableEnabled>
+          <CanModifyGlobalFilterSettings>1</CanModifyGlobalFilterSettings>
+          <CanModifyIsSortableSettings>1</CanModifyIsSortableSettings>
+          <IsDataSourceSecret>0</IsDataSourceSecret>
+          <AutoNumberFormat></AutoNumberFormat>
+          <IsSearchable>0</IsSearchable>
+          <IsFilterable>0</IsFilterable>
+          <IsRetrievable>0</IsRetrievable>
+          <IsLocalizable>0</IsLocalizable>
+          <Format>date</Format>
+          <CanChangeDateTimeBehavior>1</CanChangeDateTimeBehavior>
+          <Behavior>3</Behavior>
+          <displaynames>
+            <displayname description="Suggested Follow-up" languagecode="1033" />
+          </displaynames>
+          <Descriptions>
+            <Description description="" languagecode="1033" />
+          </Descriptions>
+        </attribute>
+      </attributes>
+    </entity>
+  </EntityInfo>
+  <RibbonDiffXml />
+</Entity>

src/Testbed/Test/src/Entities/Account/RibbonDiff.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RibbonDiffXml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <CustomActions />
+  <Templates>
+    <RibbonTemplates Id="Mscrm.Templates"></RibbonTemplates>
+  </Templates>
+  <CommandDefinitions />
+  <RuleDefinitions>
+    <TabDisplayRules />
+    <DisplayRules />
+    <EnableRules />
+  </RuleDefinitions>
+  <LocLabels />
+</RibbonDiffXml>

src/Testbed/Test/src/Other/Customizations.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImportExportXml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" OrganizationVersion="9.2.26064.166" OrganizationSchemaType="Standard" CRMServerServiceabilityVersion="9.2.26064.00166">
+  <Entities />
+  <Roles />
+  <Workflows />
+  <FieldSecurityProfiles />
+  <Templates />
+  <EntityMaps />
+  <EntityRelationships />
+  <OrganizationSettings />
+  <optionsets />
+  <CustomControls />
+  <EntityDataProviders />
+  <Languages>
+    <Language>1033</Language>
+  </Languages>
+</ImportExportXml>

src/Testbed/Test/src/Other/Solution.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImportExportXml version="9.2.26064.166" SolutionPackageVersion="9.2" languagecode="1033" generatedBy="CrmLive" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" OrganizationVersion="9.2.26064.166" OrganizationSchemaType="Standard" CRMServerServiceabilityVersion="9.2.26064.00166">
+  <SolutionManifest>
+    <UniqueName>Test</UniqueName>
+    <LocalizedNames>
+      <LocalizedName description="Test" languagecode="1033" />
+    </LocalizedNames>
+    <Descriptions />
+    <Version>1.0.0.0</Version>
+    <Managed>2</Managed>
+    <Publisher>
+      <UniqueName>Reza</UniqueName>
+      <LocalizedNames>
+        <LocalizedName description="Reza" languagecode="1033" />
+      </LocalizedNames>
+      <Descriptions>
+        <Description description="Reza" languagecode="1033" />
+      </Descriptions>
+      <EMailAddress xsi:nil="true"></EMailAddress>
+      <SupportingWebsiteUrl xsi:nil="true"></SupportingWebsiteUrl>
+      <CustomizationPrefix>rn</CustomizationPrefix>
+      <CustomizationOptionValuePrefix>54842</CustomizationOptionValuePrefix>
+      <Addresses>
+        <Address>
+          <AddressNumber>1</AddressNumber>
+          <AddressTypeCode>1</AddressTypeCode>
+          <City xsi:nil="true"></City>
+          <County xsi:nil="true"></County>
+          <Country xsi:nil="true"></Country>
+          <Fax xsi:nil="true"></Fax>
+          <FreightTermsCode xsi:nil="true"></FreightTermsCode>
+          <ImportSequenceNumber xsi:nil="true"></ImportSequenceNumber>
+          <Latitude xsi:nil="true"></Latitude>
+          <Line1 xsi:nil="true"></Line1>
+          <Line2 xsi:nil="true"></Line2>
+          <Line3 xsi:nil="true"></Line3>
+          <Longitude xsi:nil="true"></Longitude>
+          <Name xsi:nil="true"></Name>
+          <PostalCode xsi:nil="true"></PostalCode>
+          <PostOfficeBox xsi:nil="true"></PostOfficeBox>
+          <PrimaryContactName xsi:nil="true"></PrimaryContactName>
+          <ShippingMethodCode>1</ShippingMethodCode>
+          <StateOrProvince xsi:nil="true"></StateOrProvince>
+          <Telephone1 xsi:nil="true"></Telephone1>
+          <Telephone2 xsi:nil="true"></Telephone2>
+          <Telephone3 xsi:nil="true"></Telephone3>
+          <TimeZoneRuleVersionNumber xsi:nil="true"></TimeZoneRuleVersionNumber>
+          <UPSZone xsi:nil="true"></UPSZone>
+          <UTCOffset xsi:nil="true"></UTCOffset>
+          <UTCConversionTimeZoneCode xsi:nil="true"></UTCConversionTimeZoneCode>
+        </Address>
+        <Address>
+          <AddressNumber>2</AddressNumber>
+          <AddressTypeCode>1</AddressTypeCode>
+          <City xsi:nil="true"></City>
+          <County xsi:nil="true"></County>
+          <Country xsi:nil="true"></Country>
+          <Fax xsi:nil="true"></Fax>
+          <FreightTermsCode xsi:nil="true"></FreightTermsCode>
+          <ImportSequenceNumber xsi:nil="true"></ImportSequenceNumber>
+          <Latitude xsi:nil="true"></Latitude>
+          <Line1 xsi:nil="true"></Line1>
+          <Line2 xsi:nil="true"></Line2>
+          <Line3 xsi:nil="true"></Line3>
+          <Longitude xsi:nil="true"></Longitude>
+          <Name xsi:nil="true"></Name>
+          <PostalCode xsi:nil="true"></PostalCode>
+          <PostOfficeBox xsi:nil="true"></PostOfficeBox>
+          <PrimaryContactName xsi:nil="true"></PrimaryContactName>
+          <ShippingMethodCode>1</ShippingMethodCode>
+          <StateOrProvince xsi:nil="true"></StateOrProvince>
+          <Telephone1 xsi:nil="true"></Telephone1>
+          <Telephone2 xsi:nil="true"></Telephone2>
+          <Telephone3 xsi:nil="true"></Telephone3>
+          <TimeZoneRuleVersionNumber xsi:nil="true"></TimeZoneRuleVersionNumber>
+          <UPSZone xsi:nil="true"></UPSZone>
+          <UTCOffset xsi:nil="true"></UTCOffset>
+          <UTCConversionTimeZoneCode xsi:nil="true"></UTCConversionTimeZoneCode>
+        </Address>
+      </Addresses>
+    </Publisher>
+    <RootComponents>
+      <RootComponent type="1" schemaName="account" behavior="2" />
+    </RootComponents>
+    <MissingDependencies />
+  </SolutionManifest>
+</ImportExportXml>

src/Testbed/XrmToolsTest.slnx

@@ -7,4 +7,7 @@
   <Folder Name="/SDK-Style/">
     <Project Path="SdkStyle/SdkPluginsCS10/SdkPluginsCS10.csproj" />
   </Folder>
+  <Folder Name="/Solutions/">
+    <Project Path="Test/Test.cdsproj" Type="d3acb8f3-9e41-48cd-a302-4b7a9d6a2a49" />
+  </Folder>
 </Solution>