Skip to content

Commit 04b56fd

Browse files
smdnsmdn
committed
remove code for .NET 7.0 preview SDK
1 parent 7dc304b commit 04b56fd

File tree

9 files changed

+15
-31
lines changed

9 files changed

+15
-31
lines changed

src/Sdk.net7.0-preview.props renamed to src/Sdk.net7.0.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@ SPDX-License-Identifier: MIT
55
<Project>
66
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0.0'))">
77
<TargetFrameworks>net7.0;$(TargetFrameworks)</TargetFrameworks>
8-
<EnablePreviewFeatures Condition="$(TargetFramework.StartsWith('net7'))">true</EnablePreviewFeatures>
9-
<RunningOnNet7PreviewSdk Condition="$(NETCoreSdkVersion.Contains('preview'))">true</RunningOnNet7PreviewSdk>
108
</PropertyGroup>
119
</Project>

‎src/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi.Core.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SPDX-License-Identifier: MIT
1313
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1414
</PropertyGroup>
1515

16-
<Import Project="..\Sdk.net7.0-preview.props" />
16+
<Import Project="..\Sdk.net7.0.props" />
1717

1818
<PropertyGroup Condition=" '$(Configuration)' == 'Release' " Label="Required properties to generate API list">
1919
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -29,11 +29,8 @@ SPDX-License-Identifier: MIT
2929
</PropertyGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="6.0.0" Condition="$(TargetFramework.StartsWith('net7.')) Or $(TargetFramework.StartsWith('net6.')) Or $(TargetFramework.StartsWith('netcoreapp'))" />
33-
<!--
34-
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="6.0.0" Condition="$(TargetFramework.StartsWith('netcoreapp'))" />
35-
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" Condition="$(TargetFramework.StartsWith('net7.')) Or $(TargetFramework.StartsWith('net6.'))" />
36-
-->
32+
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="6.0.0" Condition="$(TargetFramework.StartsWith('net6.')) Or $(TargetFramework.StartsWith('netcoreapp'))" />
33+
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" Condition="$(TargetFramework.StartsWith('net7.'))" />
3734
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
3835
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
3936

‎src/Smdn.Reflection.ReverseGenerating/Smdn.Reflection.ReverseGenerating.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ SPDX-License-Identifier: MIT
1111
<PackageValidationBaselineVersion>1.0.0</PackageValidationBaselineVersion>
1212
<Nullable>enable</Nullable>
1313
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
14+
</PropertyGroup>
15+
16+
<Import Project="..\Sdk.net7.0.props" />
17+
18+
<PropertyGroup>
1419
<DefineConstants Condition="
1520
!(
1621
$(TargetFramework.StartsWith('net4')) Or
@@ -24,8 +29,6 @@ SPDX-License-Identifier: MIT
2429
">$(DefineConstants);WORKAROUND_NULLABILITYINFO_BYREFTYPE</DefineConstants>
2530
</PropertyGroup>
2631

27-
<Import Project="..\Sdk.net7.0-preview.props" />
28-
2932
<PropertyGroup Condition=" '$(Configuration)' == 'Release' " Label="Required properties to generate API list">
3033
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
3134
</PropertyGroup>

‎tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi.Core.Tests.csproj‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ SPDX-License-Identifier: MIT
1111
<NoWarn>CS2002;$(NoWarn)</NoWarn>
1212
</PropertyGroup>
1313

14-
<Import Project="..\..\src\Sdk.net7.0-preview.props" />
15-
16-
<PropertyGroup>
17-
<DefineConstants Condition="'$(RunningOnNet7PreviewSdk)' == 'true'">$(DefineConstants);SDK_NET7_PREVIEW</DefineConstants>
18-
</PropertyGroup>
14+
<Import Project="..\..\src\Sdk.net7.0.props" />
1915

2016
<ItemGroup>
2117
<Compile Include="..\Common\**\*.cs" />
@@ -25,8 +21,6 @@ SPDX-License-Identifier: MIT
2521
</ItemGroup>
2622

2723
<Target Name="WriteTestAssemblyInfo" BeforeTargets="BeforeBuild">
28-
<Warning Condition="'$(RunningOnNet7PreviewSdk)' == 'true'" Text="running on .NET 7 preview SDK" />
29-
3024
<ItemGroup>
3125
<TestProjects Include="$(TestAssemblyRootDirectory)\LibA\LibA.csproj" />
3226
<TestProjects Include="$(TestAssemblyRootDirectory)\LibB\LibB.csproj" />
@@ -43,10 +37,10 @@ SPDX-License-Identifier: MIT
4337
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=netstandard2.1">
4438
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesNetStandard21" />
4539
</MSBuild>
46-
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=net6.0" Condition="'$(RunningOnNet7PreviewSdk)' != 'true'">
40+
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=net6.0">
4741
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesNet60" />
4842
</MSBuild>
49-
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=net7.0" Condition="'$(RunningOnNet7PreviewSdk)' != 'true' and $(TargetFrameworks.Contains('net7.0'))">
43+
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=net7.0" Condition="$(TargetFrameworks.Contains('net7.0'))">
5044
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesNet70" />
5145
</MSBuild>
5246

‎tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/AssemblyLoader.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ public void Init()
4141
[TestCase(true, "netstandard2.1")]
4242
[TestCase(false, "netstandard2.1")]
4343
#endif
44-
#if !SDK_NET7_PREVIEW
4544
#if NET6_0_OR_GREATER
4645
[TestCase(true, "net6.0")]
4746
[TestCase(false, "net6.0")]
4847
#endif
4948
#if NET7_0_OR_GREATER
5049
[TestCase(true, "net7.0")]
5150
[TestCase(false, "net7.0")]
52-
#endif
5351
#endif
5452
public void UsingAssembly(bool loadIntoReflectionOnlyContext, string targetFrameworkMoniker)
5553
{
@@ -104,15 +102,13 @@ public void UsingAssembly(bool loadIntoReflectionOnlyContext, string targetFrame
104102
[TestCase(true, "netstandard2.1")]
105103
[TestCase(false, "netstandard2.1")]
106104
#endif
107-
#if !SDK_NET7_PREVIEW
108105
#if NET6_0_OR_GREATER
109106
[TestCase(true, "net6.0")]
110107
[TestCase(false, "net6.0")]
111108
#endif
112109
#if NET7_0_OR_GREATER
113110
[TestCase(true, "net7.0")]
114111
[TestCase(false, "net7.0")]
115-
#endif
116112
#endif
117113
public void UsingAssembly_FromStream(bool loadIntoReflectionOnlyContext, string targetFrameworkMoniker)
118114
{
@@ -171,15 +167,13 @@ public void UsingAssembly_FromStream(bool loadIntoReflectionOnlyContext, string
171167
[TestCase(true, "netstandard2.1")]
172168
[TestCase(false, "netstandard2.1")]
173169
#endif
174-
#if !SDK_NET7_PREVIEW
175170
#if NET6_0_OR_GREATER
176171
[TestCase(true, "net6.0")]
177172
[TestCase(false, "net6.0")]
178173
#endif
179174
#if NET7_0_OR_GREATER
180175
[TestCase(true, "net7.0")]
181176
[TestCase(false, "net7.0")]
182-
#endif
183177
#endif
184178
public void UsingAssembly_ResolveDependency(bool loadIntoReflectionOnlyContext, string targetFrameworkMoniker)
185179
{
@@ -234,15 +228,13 @@ public void UsingAssembly_ResolveDependency(bool loadIntoReflectionOnlyContext,
234228
[TestCase(true, "netstandard2.1")]
235229
[TestCase(false, "netstandard2.1")]
236230
#endif
237-
#if !SDK_NET7_PREVIEW
238231
#if NET6_0_OR_GREATER
239232
[TestCase(true, "net6.0")]
240233
[TestCase(false, "net6.0")]
241234
#endif
242235
#if NET7_0_OR_GREATER
243236
[TestCase(true, "net7.0")]
244237
[TestCase(false, "net7.0")]
245-
#endif
246238
#endif
247239
public void UsingAssembly_FromStream_ResolveDependency(bool loadIntoReflectionOnlyContext, string targetFrameworkMoniker)
248240
{

‎tests/Smdn.Reflection.ReverseGenerating/Smdn.Reflection.ReverseGenerating.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT
1212
<Nullable>warnings</Nullable>
1313
</PropertyGroup>
1414

15-
<Import Project="..\..\src\Sdk.net7.0-preview.props" />
15+
<Import Project="..\..\src\Sdk.net7.0.props" />
1616

1717
<ItemGroup>
1818
<Compile Include="..\Common\**\*.cs" />

‎tests/test-assm/LibA/LibA.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
44
</PropertyGroup>
55

6-
<Import Project="..\..\..\src\Sdk.net7.0-preview.props" />
6+
<Import Project="..\..\..\src\Sdk.net7.0.props" />
77
</Project>

‎tests/test-assm/LibB/LibB.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
44
</PropertyGroup>
55

6-
<Import Project="..\..\..\src\Sdk.net7.0-preview.props" />
6+
<Import Project="..\..\..\src\Sdk.net7.0.props" />
77

88
<ItemGroup>
99
<ProjectReference Include="..\LibA\LibA.csproj" />

‎tests/test-assm/LibReferencedAssemblies1/LibReferencedAssemblies1.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
44
</PropertyGroup>
55

6-
<Import Project="..\..\..\src\Sdk.net7.0-preview.props" />
6+
<Import Project="..\..\..\src\Sdk.net7.0.props" />
77
</Project>

0 commit comments

Comments
 (0)