Revert change to switch DiscUtils to MyGet version (#113)

* Revert change to switch DiscUtils to MyGet version
microsoft · Jun 10, 2020 · bfc5945 · bfc5945
1 parent 51797ab
commit bfc5945
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 30 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -26,14 +26,9 @@ jobs:
       with:
         languages: csharp
 
-    - name: Setup NuGet.exe for use with actions
-      uses: NuGet/setup-nuget@v1.0.2
-      with:
-        nuget-version: latest
-
     - name: Build OSS Gadget
       run: |
-         nuget restore OSSGadget.sln -ConfigFile NuGet.Config
+         dotnet restore OSSGadget.sln
          dotnet build -c Release
       working-directory: ./src
 

diff --git a/Pipelines/core-pipeline.yml b/Pipelines/core-pipeline.yml
@@ -37,13 +37,11 @@ stages:
       displayName: Install Nuget Tool
       inputs:
         versionSpec: '5.4.x'
-    - task: NuGetCommand@2
-      displayName: NuGet Restore
+    - task: DotNetCoreCLI@2
+      displayName: Dotnet Restore
       inputs:
         command: 'restore'
-        restoreSolution: 'src/OSSGadget.sln'
-        feedsToUse: 'config'
-        nugetConfigPath: 'src/NuGet.Config'
+        projects: 'src/oss-tests/oss-tests.csproj'
         verbosityRestore: 'Normal'
     - task: DotNetCoreCLI@2
       displayName: Dotnet Test

diff --git a/Pipelines/recursiveextractor-pipeline.yml b/Pipelines/recursiveextractor-pipeline.yml
@@ -35,13 +35,11 @@ stages:
       displayName: Install Nuget Tool
       inputs:
         versionSpec: '5.4.x'
-    - task: NuGetCommand@2
-      displayName: NuGet Restore
+    - task: DotNetCoreCLI@2
+      displayName: Dotnet Restore
       inputs:
         command: 'restore'
-        restoreSolution: 'src/RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj'
-        feedsToUse: 'config'
-        nugetConfigPath: 'src/NuGet.Config'
+        projects: 'src/RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj'
         verbosityRestore: 'Normal'
     - task: DotNetCoreCLI@2
       displayName: Dotnet Test

diff --git a/src/NuGet.Config b/src/NuGet.Config
diff --git a/src/RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj b/src/RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj
@@ -10,8 +10,18 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
-    <PackageReference Include="DiscUtils" Version="0.16.0-alpha0020" />
+    <PackageReference Include="DiscUtils.Btrfs" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.HfsPlus" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.SquashFs" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.Xfs" Version="0.15.1-ci0002" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0-preview-20200428-01" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
+    <PackageReference Include="coverlet.collector" Version="1.2.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Sarif.Sdk" Version="2.2.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/RecursiveExtractor/RecursiveExtractor.csproj b/src/RecursiveExtractor/RecursiveExtractor.csproj
@@ -25,7 +25,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DiscUtils" Version="0.16.0-alpha0020" />
+    <PackageReference Include="DiscUtils.Btrfs" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.Core" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.Ext" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.Fat" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.HfsPlus" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.Iso9660" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.Ntfs" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.Vhd" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.Vhdx" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.Vmdk" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.Wim" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.Xfs" Version="0.15.1-ci0002" />
     <PackageReference Include="NLog" Version="4.7.2" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="SharpZipLib" Version="1.2.0" />

diff --git a/src/oss-tests/oss-tests.csproj b/src/oss-tests/oss-tests.csproj
@@ -9,10 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DiscUtils.Btrfs" Version="0.16.0-alpha0020" />
-    <PackageReference Include="DiscUtils.HfsPlus" Version="0.16.0-alpha0020" />
-    <PackageReference Include="DiscUtils.SquashFs" Version="0.16.0-alpha0020" />
-    <PackageReference Include="DiscUtils.Xfs" Version="0.16.0-alpha0020" />
+    <PackageReference Include="DiscUtils.Btrfs" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.HfsPlus" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.SquashFs" Version="0.15.1-ci0002" />
+    <PackageReference Include="DiscUtils.Xfs" Version="0.15.1-ci0002" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0-preview-20200428-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />