removed unsupported fx

pamidur · Jan 21, 2022 · aa979ad · aa979ad
1 parent cd5e0fb
commit aa979ad
Show file tree

Hide file tree

Showing 15 changed files with 185 additions and 66 deletions.
diff --git a/AspectInjector.sln b/AspectInjector.sln
diff --git a/external/FluentIL b/external/FluentIL
diff --git a/nuget/build/AspectInjector.targets b/nuget/build/AspectInjector.targets
@@ -11,6 +11,7 @@
 
   <PropertyGroup>
     <_InjectAspectsDependsOn>
+      _ASI_Custom_Target;
       _ASI_CheckAssemblyChanged;
       _ASI_InjectAspectsCore;
       _ASI_ResignAssembly;
@@ -38,7 +39,7 @@
       <_CmdParams Condition=" '$(_ASI_Verbose)' == 'true' ">$(_CmdParams) -v</_CmdParams>
     </PropertyGroup>
     <PropertyGroup>
-      <_ProcessCmd>&quot;$(AspectInjector_Location)&quot; $(_CmdParams) -rf &quot;%(IntermediateAssembly.FullPath)$(_ASI_RefsFileExt)&quot; &quot;@(IntermediateAssembly->'%(FullPath)')&quot;</_ProcessCmd>
+      <_ProcessCmd>&quot;$(AspectInjector_Location)&quot;$(_CmdParams) -rf &quot;%(IntermediateAssembly.FullPath)$(_ASI_RefsFileExt)&quot; &quot;@(IntermediateAssembly->'%(FullPath)')&quot;</_ProcessCmd>
     </PropertyGroup>
 
     <Message Condition=" '$(AspectInjector_Debug)' == 'true' " Importance="high" Text="$(_ProcessCmd)"/>
@@ -80,10 +81,10 @@
       <_InjectionNeeded Condition="'$(_TSOld)' != '$(_TSNew)' AND '$(_TSNew)' != '' ">true</_InjectionNeeded>
     </PropertyGroup>
     <WriteLinesToFile Condition="'$(_InjectionNeeded)' == 'true'"
-        File="%(IntermediateAssembly.FullPath)$(_ASI_RefsFileExt)"
-        Lines="@(ReferencePath->'%(FullPath)')"
-        Overwrite="true"
-        Encoding="Unicode"/>
+			File="%(IntermediateAssembly.FullPath)$(_ASI_RefsFileExt)"
+			Lines="@(ReferencePath->'%(FullPath)')"
+			Overwrite="true"
+			Encoding="Unicode"/>
     <Message Text="Assembly requires injection." Condition="'$(_InjectionNeeded)' == 'true'"/>
   </Target>
 
@@ -110,5 +111,8 @@
     <Message Text="SnTool found: $(SnTool)"/>
   </Target>
 
+  <Target Name="_ASI_Custom_Target">
+  </Target>
+
 </Project>
 
diff --git a/src/AspectInjector.Analyzer.Vsix/AspectInjector.Analyzer.Vsix.csproj b/src/AspectInjector.Analyzer.Vsix/AspectInjector.Analyzer.Vsix.csproj
@@ -3,12 +3,13 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PackageId>AspectInjector.Analyzer.Vsix</PackageId>
-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>14.0</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -22,7 +23,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AspectInjector.Analyzer.Vsix</RootNamespace>
     <AssemblyName>AspectInjector.Analyzer</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -62,21 +63,18 @@
     <ProjectReference Include="..\..\external\FluentIL\src\FluentIL.Common\FluentIL.Common.csproj">
       <Project>{7bd22418-f4a9-422b-9fde-a20708ba0648}</Project>
       <Name>FluentIL.Common</Name>
-      <AdditionalProperties>TargetFramework=netstandard1.3</AdditionalProperties>
+    </ProjectReference>
+    <ProjectReference Include="..\AspectInjector.Analyzer\AspectInjector.Analyzer.csproj">
+      <Project>{8a2e5556-55a4-4a1c-be82-7603befa1a19}</Project>
+      <Name>AspectInjector.Analyzer</Name>
     </ProjectReference>
     <ProjectReference Include="..\AspectInjector.Broker\AspectInjector.Broker.csproj">
       <Project>{0926fe28-73ba-4f73-9188-b196fbbc9410}</Project>
       <Name>AspectInjector.Broker</Name>
-      <AdditionalProperties>TargetFramework=netstandard1.3</AdditionalProperties>
     </ProjectReference>
     <ProjectReference Include="..\AspectInjector.Rules\AspectInjector.Rules.csproj">
       <Project>{20ed44a4-9d35-41f2-a317-c1eb9923379e}</Project>
       <Name>AspectInjector.Rules</Name>
-      <AdditionalProperties>TargetFramework=netstandard1.3</AdditionalProperties>
-    </ProjectReference>
-    <ProjectReference Include="..\AspectInjector.Analyzer\AspectInjector.Analyzer.csproj">
-      <Project>{EB78F1E8-4CEB-45D1-90EB-57A159E606C0}</Project>
-      <Name>AspectInjector.Analyzer</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/AspectInjector.Analyzer.Vsix/source.extension.vsixmanifest b/src/AspectInjector.Analyzer.Vsix/source.extension.vsixmanifest
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-  <Metadata>
-    <Identity Id="AspectInjector1.Analyzer.275fe9ce-23cf-4f50-a564-419c2daae258" Version="1.1" Language="en-US" Publisher="aguly"/>
-    <DisplayName>AspectInjector1.Analyzer</DisplayName>
-    <Description xml:space="preserve">This is a sample diagnostic extension for the .NET Compiler Platform ("Roslyn").</Description>
-  </Metadata>
-  <Installation>
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,)" />
-  </Installation>
-  <Dependencies>
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6.1,)" />
-  </Dependencies>
-  <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="AspectInjector.Analyzer" Path="|AspectInjector.Analyzer|"/>
-    <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="AspectInjector.Analyzer" Path="|AspectInjector.Analyzer|"/>
-    <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="AspectInjector.Broker" Path="|AspectInjector.Broker|" AssemblyName="|AspectInjector.Broker;AssemblyName|" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="AspectInjector.Rules" Path="|AspectInjector.Rules|" AssemblyName="|AspectInjector.Rules;AssemblyName|" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="FluentIL.Common" Path="|FluentIL.Common|" AssemblyName="|FluentIL.Common;AssemblyName|" />
-  </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
-    <Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[15.0,16.0)" DisplayName="Roslyn Language Services" />
-  </Prerequisites>
+    <Metadata>
+        <Identity Id="AspectInjector1.Analyzer.275fe9ce-23cf-4f50-a564-419c2daae258" Version="1.1" Language="en-US" Publisher="aguly"/>
+        <DisplayName>AspectInjector1.Analyzer</DisplayName>
+        <Description xml:space="preserve">This is a sample diagnostic extension for the .NET Compiler Platform ("Roslyn").</Description>
+    </Metadata>
+    <Installation>
+        <InstallationTarget Version="[16.0,)" Id="Microsoft.VisualStudio.Community" />
+    </Installation>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6.1,)" />
+    </Dependencies>
+    <Assets>
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="AspectInjector.Analyzer" Path="|AspectInjector.Analyzer|"/>
+        <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="AspectInjector.Analyzer" Path="|AspectInjector.Analyzer|"/>
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="AspectInjector.Broker" Path="|AspectInjector.Broker|" AssemblyName="|AspectInjector.Broker;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="AspectInjector.Rules" Path="|AspectInjector.Rules|" AssemblyName="|AspectInjector.Rules;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="FluentIL.Common" Path="|FluentIL.Common|" AssemblyName="|FluentIL.Common;AssemblyName|" />
+    </Assets>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,)" DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[16.0,)" DisplayName="Roslyn Language Services" />
+    </Prerequisites>
 </PackageManifest>
diff --git a/src/AspectInjector.Analyzer/AspectInjector.Analyzer.csproj b/src/AspectInjector.Analyzer/AspectInjector.Analyzer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
@@ -10,7 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.10.0" />
   </ItemGroup>
 

diff --git a/src/AspectInjector.Broker/AspectInjector.Broker.csproj b/src/AspectInjector.Broker/AspectInjector.Broker.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>_key.snk</AssemblyOriginatorKeyFile>
     <Description>Broker for Aspect Injector operations.</Description>

diff --git a/src/AspectInjector.Core/AspectInjector.Core.csproj b/src/AspectInjector.Core/AspectInjector.Core.csproj
@@ -5,8 +5,8 @@
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Mono.Cecil" Version="0.11.3" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\external\FluentIL\src\FluentIL\FluentIL.csproj" />

diff --git a/src/AspectInjector.Rules/AspectInjector.Rules.csproj b/src/AspectInjector.Rules/AspectInjector.Rules.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\external\FluentIL\src\FluentIL.Common\FluentIL.Common.csproj" />

diff --git a/tests/AspectInjector.Analyzer.Tests/AspectInjector.Analyzer.Tests.csproj b/tests/AspectInjector.Analyzer.Tests/AspectInjector.Analyzer.Tests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <AspectInjector_Enabled>false</AspectInjector_Enabled>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/tests/AspectInjector.Tests.Generics/AspectInjector.Tests.Generics.csproj b/tests/AspectInjector.Tests.Generics/AspectInjector.Tests.Generics.csproj
@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <LangVersion>7.1</LangVersion>
     <Configurations>Debug;Release;DebugTests</Configurations>
-    <AspectInjector_Debug Condition=" '$(Configuration)' == 'DebugTests' ">true</AspectInjector_Debug>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\AspectInjector.Broker\AspectInjector.Broker.csproj" />
     <ProjectReference Include="..\AspectInjector.Tests.RuntimeAssets\AspectInjector.Tests.RuntimeAssets.csproj" />

diff --git a/tests/AspectInjector.Tests.Integrity/AspectInjector.Tests.Integrity.csproj b/tests/AspectInjector.Tests.Integrity/AspectInjector.Tests.Integrity.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Unofficial.CoreRT.ILVerify" Version="0.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

diff --git a/tests/AspectInjector.Tests.Runtime/AspectInjector.Tests.Runtime.csproj b/tests/AspectInjector.Tests.Runtime/AspectInjector.Tests.Runtime.csproj
@@ -1,16 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6;net471;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net471;net461</TargetFrameworks>
     <LangVersion>7.3</LangVersion>
     <Configurations>Debug;Release;DebugTests</Configurations>
-    <AspectInjector_Debug Condition=" '$(Configuration)' == 'DebugTests' ">true</AspectInjector_Debug>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

diff --git a/tests/AspectInjector.Tests.RuntimeAssets/AspectInjector.Tests.RuntimeAssets.csproj b/tests/AspectInjector.Tests.RuntimeAssets/AspectInjector.Tests.RuntimeAssets.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6;net471;net461</TargetFrameworks>
     <Configurations>Debug;Release;DebugTests</Configurations>
-    <AspectInjector_Debug Condition=" '$(Configuration)' == 'DebugTests' ">true</AspectInjector_Debug>  
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net471;net461</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
@@ -13,6 +12,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\AspectInjector.Broker\AspectInjector.Broker.csproj" />
-  </ItemGroup>   
+  </ItemGroup>
 
 </Project>
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
@@ -1,13 +1,18 @@
-<Project> 
-  
+<Project>
+
   <PropertyGroup>
-    <ASI_LOCAL_BUILD>$(MSBuildThisFileDirectory)../src/AspectInjector/bin/$(Configuration)/net6</ASI_LOCAL_BUILD>
-    <ASI_LOCAL_BUILD Condition=" '$(Configuration)' == 'DebugTests' ">$(MSBuildThisFileDirectory)../src/AspectInjector/bin/Debug/net6</ASI_LOCAL_BUILD>
+    <ASI_LOCAL_BUILD>$(MSBuildThisFileDirectory)../src/AspectInjector/bin/$(Configuration)/net6.0</ASI_LOCAL_BUILD>
+    <ASI_LOCAL_BUILD Condition=" '$(Configuration)' == 'DebugTests' ">$(MSBuildThisFileDirectory)../src/AspectInjector/bin/Debug/net6.0</ASI_LOCAL_BUILD>
 
     <AspectInjector_Location Condition="$([MSBuild]::IsOSPlatform('Linux'))">$(ASI_LOCAL_BUILD)/AspectInjector</AspectInjector_Location>
     <AspectInjector_Location Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(ASI_LOCAL_BUILD)/AspectInjector</AspectInjector_Location>
     <AspectInjector_Location Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(ASI_LOCAL_BUILD)/AspectInjector.exe</AspectInjector_Location>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(Configuration)' == 'DebugTests' AND '$(TargetFramework)' == 'net6.0'">
+    <AspectInjector_Debug>true</AspectInjector_Debug>
+  </PropertyGroup>
+
   <Import Project="..\nuget\build\AspectInjector.targets" />
+
 </Project>
+1 −1		src/FluentIL.Common/FluentIL.Common.csproj
+2 −2		src/FluentIL/FluentIL.csproj