8000 Rename StaticProxy to CompiledProxy by kzu · Pull Request #240 · devlooped/stunts · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Stunts.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<Project Path="src/Stunts.DynamicProxy/Stunts.DynamicProxy.csproj" />
<Project Path="src/Stunts.IntegrationTests/Stunts.IntegrationTests.csproj" />
<Project Path="src/Stunts.Package/Stunts.Package.msbuildproj" Type="13b669be-bb05-4ddf-9536-439f39a36129" />
<Project Path="src/Stunts.StaticProxy/Stunts.StaticProxy.csproj" />
<Project Path="src/Stunts.CompiledProxy/Stunts.CompiledProxy.csproj" />
<Project Path="src/Stunts.UnitTests/Stunts.UnitTests.csproj" />
<Project Path="src/Stunts/Stunts.csproj" />
</Solution>
2 changes: 1 addition & 1 deletion src/Directory.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<!-- We need this in .props so it kicks-in before all the common.props defaulting -->
<PropertyGroup Label="Stunts.StaticProxy" Condition="$(MSBuildProjectName) == 'Stunts.StaticProxy'">
<PropertyGroup Label="Stunts.CompiledProxy" Condition="$(MSBuildProjectName) == 'Stunts.CompiledProxy'">
<!-- Compile against the 5.0 public API. tools\5.0 is the 5.x band, so the
same generator loads on 5.0 through the latest 5.x compiler. -->
<RoslynVersion>5.0.0</RoslynVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<NoWarn>$(NoWarn);RS1042;RS1036</NoWarn>
</PropertyGroup>

<Import Project="Stunts.StaticProxy.targets"/>
<Import Project="Stunts.CompiledProxy.targets"/>

<ItemGroup>
<!-- Emitted into compilations that proxy a ref struct or pointer. netstandard2.0 cannot compile it. -->
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/Stunts.IntegrationTests/Stunts.IntegrationTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<ProjectReference Include="..\Stunts\Stunts.csproj" />
<ProjectReference Include="..\Stunts.CodeAnalysis\Stunts.CodeAnalysis.csproj" />
<ProjectReference Include="..\Stunts.DynamicProxy\Stunts.DynamicProxy.csproj" />
<ProjectReference Include="..\Stunts.StaticProxy\Stunts.StaticProxy.csproj" />
<ProjectReference Include="..\Stunts.CompiledProxy\Stunts.CompiledProxy.csproj" />
<ProjectReference Include="..\ManualStunts\ManualStunts.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Stunts.Package/Stunts.Package.msbuildproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ service.AddBehavior(...);
<ProjectReference Include="..\Stunts\Stunts.csproj" />
<ProjectReference Include="..\Stunts.CodeAnalysis\Stunts.CodeAnalysis.csproj" AdditionalProperties="IsPackable=false" />
<ProjectReference Include="..\Stunts.CodeFixes\Stunts.CodeFixes.csproj" AdditionalProperties="IsPackable=false" />
<ProjectReference Include="..\Stunts.StaticProxy\Stunts.StaticProxy.csproj" AdditionalProperties="IsPackable=false" />
<ProjectReference Include="..\Stunts.CompiledProxy\Stunts.CompiledProxy.csproj" AdditionalProperties="IsPackable=false" />
</ItemGroup>
<Target Name="CopyVersion" Inputs="Stunts.Version.props" Outputs="$(IntermediateOutputPath)Stunts.Version.props">
<Copy SourceFiles="Stunts.Version.props" DestinationFiles="$(IntermediateOutputPath)Stunts.Version.props" SkipUnchangedFiles="true" />
Expand Down
8 changes: 4 additions & 4 deletions src/Stunts.Package/Stunts.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!-- If source generators aren't supported, we just won't register the static one -->
<!-- If source generators aren't supported, we just won't register the compiled one -->
<PropertyGroup>
<SourceGeneratorSupported Condition="'$(Language)' == 'C#' AND $([System.Version]::Parse('16.8.0').CompareTo($([System.Version]::Parse($(MSBuildVersion))))) != 1">true</SourceGeneratorSupported>
<EnableCompileTimeStunts Condition="'$(EnableCompileTimeStunts)' == '' AND '$(SourceGeneratorSupported)' == 'true'">true</EnableCompileTimeStunts>
Expand Down Expand Up @@ -35,11 +35,11 @@
<StuntsAnalyzerDir>$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory)..\..\tools\5.0))</StuntsAnalyzerDir>
</PropertyGroup>

<Error Condition="!Exists('$(StuntsAnalyzerDir)\Stunts.StaticProxy.dll')" Code="ST010"
Text="Stunts.StaticProxy was not found under tools\5.0. Install the Stunts.DynamicProxy package to use run-time stunts." />
<Error Condition="!Exists('$(StuntsAnalyzerDir)\Stunts.CompiledProxy.dll')" Code="ST010"
Text="Stunts.CompiledProxy was not found under tools\5.0. Install the Stunts.DynamicProxy package to use run-time stunts." />

<ItemGroup>
<Analyzer Include="$(StuntsAnalyzerDir)\Stunts.StaticProxy.dll" NuGetPackageId="Stunts" NuGetPackageVersion="$(StuntsVersion)" />
<Analyzer Include="$(StuntsAnalyzerDir)\Stunts.CompiledProxy.dll" NuGetPackageId="Stunts" NuGetPackageVersion="$(StuntsVersion)" />
</ItemGroup>

</Target>
Expand Down
4 changes: 2 additions & 2 deletions src/Stunts.UnitTests/Stunts.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<ProjectReference Include="..\Stunts.CodeAnalysis\Stunts.CodeAnalysis.csproj" />
<ProjectReference Include="..\Stunts.CodeFixes\Stunts.CodeFixes.csproj" />
<ProjectReference Include="..\Stunts.DynamicProxy\Stunts.DynamicProxy.csproj" />
<ProjectReference Include="..\Stunts.StaticProxy\Stunts.StaticProxy.csproj" />
<ProjectReference Include="..\Stunts.CompiledProxy\Stunts.CompiledProxy.csproj" />
<ProjectReference Include="..\ManualStunts\ManualStunts.csproj" />
</ItemGroup>

Expand All @@ -72,7 +72,7 @@
<ItemGroup>
<Compile Include="..\Stunts.Package\Stunt.cs" Link="Stunt\Stunt.cs" CopyToOutputDirectory="PreserveNewest" />
<Compile Include="..\Stunts.Package\Stunt.StaticFactory.cs" Link="Stunt\Stunt.StaticFactory.cs" CopyToOutputDirectory="PreserveNewest" />
<Compile Include="..\Stunts.StaticProxy\SignatureRef.cs" Link="SignatureRef.cs" />
<Compile Include="..\Stunts.CompiledProxy\SignatureRef.cs" Link="SignatureRef.cs" />
</ItemGroup>

<Target Name="ClearMSBuild" AfterTargets="Build">
Expand Down
Loading
0