diff --git a/DllImportGenerator/Directory.Build.props b/DllImportGenerator/Directory.Build.props deleted file mode 100644 index 61ba7c1afc32..000000000000 --- a/DllImportGenerator/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - 3.8.0-3.final - 2.4.1 - - - diff --git a/DllImportGenerator/DllImportGenerator.IntegrationTests/DllImportGenerator.IntegrationTests.csproj b/DllImportGenerator/DllImportGenerator.IntegrationTests/DllImportGenerator.IntegrationTests.csproj index b1e8ddc50400..6b3469c88b34 100644 --- a/DllImportGenerator/DllImportGenerator.IntegrationTests/DllImportGenerator.IntegrationTests.csproj +++ b/DllImportGenerator/DllImportGenerator.IntegrationTests/DllImportGenerator.IntegrationTests.csproj @@ -8,12 +8,6 @@ - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/DllImportGenerator/DllImportGenerator.UnitTests/DllImportGenerator.UnitTests.csproj b/DllImportGenerator/DllImportGenerator.UnitTests/DllImportGenerator.UnitTests.csproj index e7b9271727f2..200cd1c8c8d0 100644 --- a/DllImportGenerator/DllImportGenerator.UnitTests/DllImportGenerator.UnitTests.csproj +++ b/DllImportGenerator/DllImportGenerator.UnitTests/DllImportGenerator.UnitTests.csproj @@ -15,12 +15,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/DllImportGenerator/DllImportGenerator/DllImportGenerator.csproj b/DllImportGenerator/DllImportGenerator/DllImportGenerator.csproj index b64ed81b96b4..860f0304186f 100644 --- a/DllImportGenerator/DllImportGenerator/DllImportGenerator.csproj +++ b/DllImportGenerator/DllImportGenerator/DllImportGenerator.csproj @@ -15,13 +15,9 @@ - DllImportGenerator - 1.0.0.0 Microsoft - http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE - http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE - http://ICON_URL_HERE_OR_DELETE_THIS_LINE - http://REPOSITORY_URL_HERE_OR_DELETE_THIS_LINE + https://github.com/dotnet/runtimelab/tree/feature/DllImportGenerator + https://github.com/dotnet/runtimelab/tree/feature/DllImportGenerator false DllImportGenerator Summary of changes made in this release of the package. diff --git a/DllImportGenerator/TestAssets/NativeExports/NativeExports.csproj b/DllImportGenerator/TestAssets/NativeExports/NativeExports.csproj index 7327cb1d1969..3dd73baa4512 100644 --- a/DllImportGenerator/TestAssets/NativeExports/NativeExports.csproj +++ b/DllImportGenerator/TestAssets/NativeExports/NativeExports.csproj @@ -8,7 +8,7 @@ - + diff --git a/Experiment.sln b/Experiment.sln deleted file mode 100644 index ff3e8c0e6832..000000000000 --- a/Experiment.sln +++ /dev/null @@ -1,48 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Experiment", "src\Experiment\src\Experiment.csproj", "{B7977360-6671-4707-9A1C-1C29D5BE2674}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Experiment.Tests", "src\Experiment\tests\Experiment.Tests.csproj", "{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B7977360-6671-4707-9A1C-1C29D5BE2674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7977360-6671-4707-9A1C-1C29D5BE2674}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7977360-6671-4707-9A1C-1C29D5BE2674}.Debug|x64.ActiveCfg = Debug|Any CPU - {B7977360-6671-4707-9A1C-1C29D5BE2674}.Debug|x64.Build.0 = Debug|Any CPU - {B7977360-6671-4707-9A1C-1C29D5BE2674}.Debug|x86.ActiveCfg = Debug|Any CPU - {B7977360-6671-4707-9A1C-1C29D5BE2674}.Debug|x86.Build.0 = Debug|Any CPU - {B7977360-6671-4707-9A1C-1C29D5BE2674}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7977360-6671-4707-9A1C-1C29D5BE2674}.Release|Any CPU.Build.0 = Release|Any CPU - {B7977360-6671-4707-9A1C-1C29D5BE2674}.Release|x64.ActiveCfg = Release|Any CPU - {B7977360-6671-4707-9A1C-1C29D5BE2674}.Release|x64.Build.0 = Release|Any CPU - {B7977360-6671-4707-9A1C-1C29D5BE2674}.Release|x86.ActiveCfg = Release|Any CPU - {B7977360-6671-4707-9A1C-1C29D5BE2674}.Release|x86.Build.0 = Release|Any CPU - {CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Debug|x64.ActiveCfg = Debug|Any CPU - {CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Debug|x64.Build.0 = Debug|Any CPU - {CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Debug|x86.ActiveCfg = Debug|Any CPU - {CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Debug|x86.Build.0 = Debug|Any CPU - {CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Release|Any CPU.Build.0 = Release|Any CPU - {CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Release|x64.ActiveCfg = Release|Any CPU - {CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Release|x64.Build.0 = Release|Any CPU - {CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Release|x86.ActiveCfg = Release|Any CPU - {CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/NuGet.config b/NuGet.config index fed8b5c2e8ec..48e097dfd887 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Build.props b/eng/Build.props new file mode 100644 index 000000000000..7211b8f36a39 --- /dev/null +++ b/eng/Build.props @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index 49157fff96db..76c8b8067832 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,9 +12,11 @@ true false - 6.0.0-alpha.1.20514.9 + 6.0.0-alpha.1.20554.9 16.7.1 2.4.1 2.4.3 + + 3.8.0-3.final diff --git a/eng/pipelines/runtimelab.yml b/eng/pipelines/runtimelab.yml index 44dc45e842cd..8498c5d1df52 100644 --- a/eng/pipelines/runtimelab.yml +++ b/eng/pipelines/runtimelab.yml @@ -21,6 +21,7 @@ trigger: - README.md - SECURITY.md - THIRD-PARTY-NOTICES.TXT + - DllImportGenerator/designs/* pr: branches: @@ -40,6 +41,7 @@ pr: - README.md - SECURITY.md - THIRD-PARTY-NOTICES.TXT + - DllImportGenerator/designs/* variables: - name: _TeamName @@ -63,20 +65,21 @@ stages: pool: vmImage: 'windows-latest' - - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/pipelines/templates/build-job.yml - parameters: - osGroup: OSX - archType: x64 - pool: - vmImage: 'macOS-latest' + # Only run on Windows until we are using a runtime and SDK with https://github.com/dotnet/runtime/pull/43962 + # - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + # - template: /eng/pipelines/templates/build-job.yml + # parameters: + # osGroup: OSX + # archType: x64 + # pool: + # vmImage: 'macOS-latest' - - template: /eng/pipelines/templates/build-job.yml - parameters: - osGroup: Linux - archType: x64 - pool: - vmImage: 'ubuntu-latest' + # - template: /eng/pipelines/templates/build-job.yml + # parameters: + # osGroup: Linux + # archType: x64 + # pool: + # vmImage: 'ubuntu-latest' # Publish and validation steps. Only run in official builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/pipelines/templates/build-job.yml b/eng/pipelines/templates/build-job.yml index a2c86756f01d..8770656197c0 100644 --- a/eng/pipelines/templates/build-job.yml +++ b/eng/pipelines/templates/build-job.yml @@ -51,7 +51,7 @@ jobs: - _testBuildArg: '' - ${{ if eq(parameters.runTests, true) }}: - - _testBuildArg: -test + - _testBuildArg: -test -integrationTest - _officialBuildArgs: '' - ${{ if eq(parameters.isOfficialBuild, true) }}: diff --git a/global.json b/global.json index a3dec62d65bb..f4a3263d2886 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20520.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20555.6" } } \ No newline at end of file diff --git a/src/Experiment/src/Experiment.csproj b/src/Experiment/src/Experiment.csproj deleted file mode 100644 index f208d303c981..000000000000 --- a/src/Experiment/src/Experiment.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - net5.0 - - - diff --git a/src/Experiment/src/MyClass.cs b/src/Experiment/src/MyClass.cs deleted file mode 100644 index b0121b4015cc..000000000000 --- a/src/Experiment/src/MyClass.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace Experiment -{ - public class MyClass - { - public static bool ReturnTrue => true; - } -} diff --git a/src/Experiment/tests/Experiment.Tests.csproj b/src/Experiment/tests/Experiment.Tests.csproj deleted file mode 100644 index 1f38944a6987..000000000000 --- a/src/Experiment/tests/Experiment.Tests.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - net5.0 - - - - - - diff --git a/src/Experiment/tests/MyClassTests.cs b/src/Experiment/tests/MyClassTests.cs deleted file mode 100644 index 14d4e5e50104..000000000000 --- a/src/Experiment/tests/MyClassTests.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using Xunit; - -namespace Experiment.Tests -{ - public class MyClassTests - { - [Fact] - public void Test1() - { - Assert.True(MyClass.ReturnTrue); - } - } -}