Apply changes to integrate standalone experiment CI/CD pipeline with …

…DllImportGenerator
dotnet · Nov 6, 2020 · 4956f11 · 4956f11
1 parent 3e1b2ad
commit 4956f11
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 117 deletions.
diff --git a/DllImportGenerator/Directory.Build.props b/DllImportGenerator/Directory.Build.props
diff --git a/...tGenerator/DllImportGenerator.IntegrationTests/DllImportGenerator.IntegrationTests.csproj b/...tGenerator/DllImportGenerator.IntegrationTests/DllImportGenerator.IntegrationTests.csproj
@@ -8,12 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="coverlet.collector" Version="1.3.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/DllImportGenerator/DllImportGenerator.UnitTests/DllImportGenerator.UnitTests.csproj b/DllImportGenerator/DllImportGenerator.UnitTests/DllImportGenerator.UnitTests.csproj
@@ -15,12 +15,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="coverlet.collector" Version="1.3.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/DllImportGenerator/DllImportGenerator/DllImportGenerator.csproj b/DllImportGenerator/DllImportGenerator/DllImportGenerator.csproj
@@ -15,13 +15,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackageId>DllImportGenerator</PackageId>
-    <PackageVersion>1.0.0.0</PackageVersion>
     <Authors>Microsoft</Authors>
-    <PackageLicenseUrl>http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE</PackageLicenseUrl>
-    <PackageProjectUrl>http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE</PackageProjectUrl>
-    <PackageIconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</PackageIconUrl>
-    <RepositoryUrl>http://REPOSITORY_URL_HERE_OR_DELETE_THIS_LINE</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/dotnet/runtimelab/tree/feature/DllImportGenerator</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/dotnet/runtimelab/tree/feature/DllImportGenerator</RepositoryUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Description>DllImportGenerator</Description>
     <PackageReleaseNotes>Summary of changes made in this release of the package.</PackageReleaseNotes>

diff --git a/DllImportGenerator/TestAssets/NativeExports/NativeExports.csproj b/DllImportGenerator/TestAssets/NativeExports/NativeExports.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DNNE" Version="1.0.13" />
+    <PackageReference Include="DNNE" Version="1.0.15" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Experiment.sln b/Experiment.sln
diff --git a/NuGet.config b/NuGet.config
@@ -7,6 +7,7 @@
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
   </packageSources>

diff --git a/eng/Build.props b/eng/Build.props
@@ -0,0 +1,5 @@
+<Project>
+   <ItemGroup>
+       <ProjectToBuild Include="$(RepoRoot)DllImportGenerator/DllImportGenerator.sln" />
+   </ItemGroup>
+</Project>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -12,9 +12,11 @@
     <UseVSTestRunner>true</UseVSTestRunner>
     <UsingToolXliff>false</UsingToolXliff>
     <!-- Libs -->
-    <MicrosoftNETCoreAppVersion>6.0.0-alpha.1.20514.9</MicrosoftNETCoreAppVersion>
+    <MicrosoftNETCoreAppVersion>6.0.0-alpha.1.20554.9</MicrosoftNETCoreAppVersion>
     <MicrosoftNETTestSdkVersion>16.7.1</MicrosoftNETTestSdkVersion>
     <XUnitVersion>2.4.1</XUnitVersion>
     <XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
+    <!-- Roslyn dependencies -->
+    <CompilerPlatformVersion>3.8.0-3.final</CompilerPlatformVersion>
   </PropertyGroup>
 </Project>
diff --git 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

diff --git 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
@@ -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"
     }
   }
diff --git a/src/Experiment/src/Experiment.csproj b/src/Experiment/src/Experiment.csproj
diff --git a/src/Experiment/src/MyClass.cs b/src/Experiment/src/MyClass.cs
diff --git a/src/Experiment/tests/Experiment.Tests.csproj b/src/Experiment/tests/Experiment.Tests.csproj
diff --git a/src/Experiment/tests/MyClassTests.cs b/src/Experiment/tests/MyClassTests.cs