diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 09c0377e..4fdd10c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,10 +14,6 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup .NET Core 2.1 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '2.1.x' - name: Setup .NET Core 3.1 uses: actions/setup-dotnet@v1 with: @@ -37,9 +33,6 @@ jobs: - name: Test (net462) run: ./make.ps1 -frameworks net462 test-all shell: pwsh - - name: Test (netcoreapp2.1) - run: ./make.ps1 -frameworks netcoreapp2.1 test-all - shell: pwsh - name: Test (netcoreapp3.1) run: ./make.ps1 -frameworks netcoreapp3.1 test-all shell: pwsh diff --git a/Build.proj b/Build.proj index a265d1e7..1b81dbec 100644 --- a/Build.proj +++ b/Build.proj @@ -108,7 +108,7 @@ Outputs="$(PackageDir)\DynamicLanguageRuntime.$(PackageVersion).zip"> + Exclude="$(StageDir)\netcoreapp3.1\*;$(StageDir)\net7.0*\*;$(StageDir)\net8.0*\*" /> diff --git a/Build/net452.props b/Build/net462.props similarity index 100% rename from Build/net452.props rename to Build/net462.props diff --git a/Build/netcoreapp3.1.props b/Build/netcoreapp3.1.props deleted file mode 100644 index 0db457c1..00000000 --- a/Build/netcoreapp3.1.props +++ /dev/null @@ -1,38 +0,0 @@ - - - - false - - - - $(Features);FEATURE_APARTMENTSTATE - $(Features);FEATURE_ASSEMBLY_GETFORWARDEDTYPES - $(Features);FEATURE_ASSEMBLY_RESOLVE - $(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY - $(Features);FEATURE_CODEDOM - $(Features);FEATURE_COM - $(Features);FEATURE_CONFIGURATION - $(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR - $(Features);FEATURE_EXCEPTION_STATE - $(Features);FEATURE_FILESYSTEM - $(Features);FEATURE_FULL_CRYPTO - $(Features);FEATURE_FULL_NET - $(Features);FEATURE_LCG - $(Features);FEATURE_LOADWITHPARTIALNAME - $(Features);FEATURE_METADATA_READER - $(Features);FEATURE_MMAP - $(Features);FEATURE_NATIVE - $(Features);FEATURE_PIPES - $(Features);FEATURE_PROCESS - $(Features);FEATURE_REFEMIT - $(Features);FEATURE_REGISTRY - $(Features);FEATURE_SECURITY_RULES - $(Features);FEATURE_SERIALIZATION - $(Features);FEATURE_STACK_TRACE - $(Features);FEATURE_SYNC_SOCKETS - $(Features);FEATURE_THREAD - $(Features);FEATURE_TYPE_EQUIVALENCE - $(Features);FEATURE_TYPECONVERTER - $(Features);FEATURE_XMLDOC - - diff --git a/Build/steps.yml b/Build/steps.yml index 9a098ac9..0b09ce1e 100644 --- a/Build/steps.yml +++ b/Build/steps.yml @@ -21,12 +21,6 @@ steps: Write-Host ("##vso[task.setvariable variable=PackageVersion;isSecret=false;isOutput=true;]$PackageVersion") displayName: Grab Package Version - - task: UseDotNet@2 - displayName: Install .NET Core 2.1 runtime for testing - inputs: - packageType: 'runtime' - version: '2.1.x' - - task: UseDotNet@2 displayName: Install .NET Core 3.1 runtime for testing inputs: diff --git a/Dlr.sln b/Dlr.sln index 091f0495..a371de9b 100644 --- a/Dlr.sln +++ b/Dlr.sln @@ -35,9 +35,8 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{60056F49-17D6-4C5C-80EC-F203BA2F7E3B}" ProjectSection(SolutionItems) = preProject Build\After.targets = Build\After.targets - Build\net452.props = Build\net452.props + Build\net462.props = Build\net462.props Build\net6.0.props = Build\net6.0.props - Build\netcoreapp3.1.props = Build\netcoreapp3.1.props Build\netstandard2.0.props = Build\netstandard2.0.props Build\steps.yml = Build\steps.yml EndProjectSection diff --git a/Package/nuget/DynamicLanguageRuntime.nuspec b/Package/nuget/DynamicLanguageRuntime.nuspec index 0f84a4c8..f89f6e54 100644 --- a/Package/nuget/DynamicLanguageRuntime.nuspec +++ b/Package/nuget/DynamicLanguageRuntime.nuspec @@ -15,17 +15,13 @@ en-US dynamic dlr - + - - - - - - + + @@ -33,9 +29,9 @@ - - - + + + diff --git a/Package/nuget/NuGet.Packaging.csproj b/Package/nuget/NuGet.Packaging.csproj index 07e330ac..78aca892 100644 --- a/Package/nuget/NuGet.Packaging.csproj +++ b/Package/nuget/NuGet.Packaging.csproj @@ -1,7 +1,7 @@ - net452 + net462 $(StageDir) version=$(PackageVersion) false diff --git a/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj b/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj index b43afc1b..402d7ddd 100644 --- a/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj +++ b/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj @@ -1,7 +1,7 @@  - net452;netstandard2.0;netcoreapp3.1;net6.0 + net462;netstandard2.0;net6.0 Microsoft.Scripting 859832320 true @@ -20,8 +20,8 @@ - - + + diff --git a/Src/Microsoft.Scripting.Metadata/MemoryMapping.V4.cs b/Src/Microsoft.Scripting.Metadata/MemoryMapping.V4.cs index 8adaec08..404b8e63 100644 --- a/Src/Microsoft.Scripting.Metadata/MemoryMapping.V4.cs +++ b/Src/Microsoft.Scripting.Metadata/MemoryMapping.V4.cs @@ -61,11 +61,7 @@ public static MemoryMapping Create(string path) { try { stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Delete | FileShare.ReadWrite); -#if NET452 - file = MemoryMappedFile.CreateFromFile(stream, null, 0, MemoryMappedFileAccess.Read, null, HandleInheritability.None, true); -#else file = MemoryMappedFile.CreateFromFile(stream, null, 0, MemoryMappedFileAccess.Read, HandleInheritability.None, true); -#endif accessor = file.CreateViewAccessor(0, 0, MemoryMappedFileAccess.Read); mapping = new MemoryMapping(); diff --git a/Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj b/Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj index 7f8aa3cb..ec0ae525 100644 --- a/Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj +++ b/Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj @@ -1,7 +1,7 @@  - net452;netstandard2.0 + net462;netstandard2.0 859832320 true true diff --git a/Src/Microsoft.Scripting/Microsoft.Scripting.csproj b/Src/Microsoft.Scripting/Microsoft.Scripting.csproj index 5a9c1049..358d3dd6 100644 --- a/Src/Microsoft.Scripting/Microsoft.Scripting.csproj +++ b/Src/Microsoft.Scripting/Microsoft.Scripting.csproj @@ -1,7 +1,7 @@  - net452;netstandard2.0;netcoreapp3.1;net6.0 + net462;netstandard2.0;net6.0 857735168 true @@ -11,18 +11,11 @@ - - all - - - - - - all + diff --git a/Tests/ClrAssembly/ClrAssembly.csproj b/Tests/ClrAssembly/ClrAssembly.csproj index 51395989..fda286cd 100644 --- a/Tests/ClrAssembly/ClrAssembly.csproj +++ b/Tests/ClrAssembly/ClrAssembly.csproj @@ -1,7 +1,7 @@  - net452;netstandard2.0 + net462;netstandard2.0 merlintest merlintest.dummy diff --git a/Tests/Metadata/Metadata.csproj b/Tests/Metadata/Metadata.csproj index 8bb75909..4d7374f9 100644 --- a/Tests/Metadata/Metadata.csproj +++ b/Tests/Metadata/Metadata.csproj @@ -1,8 +1,8 @@  - net462;netcoreapp2.1;netcoreapp3.1;net6.0 - + net462;netcoreapp3.1;net6.0 + false Exe true @@ -16,14 +16,9 @@ - + - - - - - diff --git a/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj b/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj index 29ab5b43..39eef772 100644 --- a/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj +++ b/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj @@ -1,22 +1,17 @@  - net462;netcoreapp2.1;netcoreapp3.1;net6.0 - + net462;netcoreapp3.1;net6.0 + false - - + + - - - - - diff --git a/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj b/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj index cc21f246..59cf05a4 100644 --- a/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj +++ b/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj @@ -1,8 +1,8 @@  - net462;netcoreapp2.1;netcoreapp3.1;net6.0 - + net462;netcoreapp3.1;net6.0 + false @@ -12,11 +12,6 @@ - - - - - diff --git a/make.ps1 b/make.ps1 index e0daba54..0deaa250 100755 --- a/make.ps1 +++ b/make.ps1 @@ -4,7 +4,7 @@ Param( [Parameter(Position=1)] [String] $target = "release", [String] $configuration = "Release", - [String[]] $frameworks=@('net462','netcoreapp2.1','netcoreapp3.1','net6.0'), + [String[]] $frameworks=@('net462','netcoreapp3.1','net6.0'), [String] $platform = "x64", [switch] $runIgnored ) @@ -62,7 +62,7 @@ function GenerateRunSettings([String] $folder, [String] $framework, [String] $pl # # -# +# # #