update

mono · Sep 29, 2022 · 9ec1af5 · 9ec1af5
1 parent c5430da
commit 9ec1af5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 17 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,7 +11,7 @@ name: $(SourceBranchName)-$(Date:yyyyMMdd)$(Rev:.r)
 variables:
   solution: 'apidoctools.sln'
   buildConfiguration: 'Release'
-  mdocPath: 'bin/$(buildConfiguration)-net6.0'
+  mdocPath: 'bin/$(buildConfiguration)'
 
 stages:
 - stage: SDLCheck
@@ -173,13 +173,6 @@ stages:
             }
           ]
 
-    - task: DotNetCoreCLI@2
-      displayName: dotnet build
-      inputs:
-        command: 'build'
-        projects: '$(solution)'
-        arguments: '-c $(BuildConfiguration)'
-
     - task: ArchiveFiles@2
       displayName: Archive mdoc Files
       inputs:

diff --git a/mdoc/Makefile b/mdoc/Makefile
@@ -59,10 +59,10 @@ cleanup:
 	-rm -Rf Test/en.actual Test/html.actual
 
 nunit: 
-	mono ../packages/NUnit.ConsoleRunner.3.6.0/tools/nunit3-console.exe mdoc.Test/bin/$(CONFIGURATION)/mdoc.Test.dll
+	mono ../packages/NUnit.ConsoleRunner.3.6.0/tools/nunit3-console.exe mdoc.Test/bin/$(CONFIGURATION)-net471/mdoc.Test.dll
 
 dotnet-test:
-	dotnet test mdoc.Test/bin/$(CONFIGURATION)-net6.0/mdoc.Test.dll
+	dotnet test mdoc.Test/bin/$(CONFIGURATION)/mdoc.Test.dll
 
 Test/DocTest-VB-Eii.dll:
 	$(VBCOMPILE) -out:Test/DocTest-VB-Eii.dll  Test/ClassEnumerator.vb

diff --git a/mdoc/compareXmlFiles.ps1 b/mdoc/compareXmlFiles.ps1
@@ -257,7 +257,7 @@ Write-Host "$nugetPath install $mdocPackageId -Version $lastVersion -Source $mdo
 
 $releaseMdocPath = Join-Path $binPath "mdoc.$lastVersion"
 dir $releaseMdocPath
-$releaseMdocPath = Join-Path $releaseMdocPath "tools\net471\mdoc.exe"
+$releaseMdocPath = Join-Path $releaseMdocPath "tools\net6.0\mdoc.exe"
 Write-Host "Download $mdocPackageId to path: $releasemdocPath"
 
 

diff --git a/mdoc/mdoc.Test/mdoc.Test.csproj b/mdoc/mdoc.Test/mdoc.Test.csproj
@@ -10,11 +10,11 @@
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net471' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' != 'net471' ">
     <OutputPath>bin\$(Configuration)</OutputPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' != 'net471' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net471' ">
     <OutputPath>bin\$(Configuration)-$(TargetFramework)</OutputPath>
   </PropertyGroup>
 

diff --git a/mdoc/mdoc.csproj b/mdoc/mdoc.csproj
@@ -9,11 +9,11 @@
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net471' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' != 'net471' ">
     <OutputPath>$(MSBuildThisFileDirectory)..\bin\$(Configuration)</OutputPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' != 'net471' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net471' ">
     <OutputPath>$(MSBuildThisFileDirectory)..\bin\$(Configuration)-$(TargetFramework)</OutputPath>
   </PropertyGroup>
 

diff --git a/mdoc/mdoc.nuspec b/mdoc/mdoc.nuspec
@@ -14,7 +14,7 @@
     <tags>mdoc documentation ecmaxml dotnet .net C# F# VB.NET</tags>
   </metadata>
   <files>
-    <file src="..\bin\Release\*.*" target="tools\net471\" />
-    <file src="..\bin\Release-net6.0\*.*" target="tools\net6.0\" />
+    <file src="..\bin\Release-net471\*.*" target="tools\net471\" />
+    <file src="..\bin\Release\*.*" target="tools\net6.0\" />
   </files>
 </package>