Deployment targets run

SteveGilham · Oct 23, 2022 · 67d02e9 · 67d02e9
1 parent 11a90f9
commit 67d02e9
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 55 deletions.
diff --git a/Build/NuGet.config.dotnettest b/Build/NuGet.config.dotnettest
@@ -4,4 +4,13 @@
     <add key="repositoryPath" value="**nowhere**" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
+  <packageSourceMapping>
+  <!-- key value for <packageSource> should match key values from <packageSources> element -->
+    <packageSource key="repositoryPath">
+    <package pattern="altcover*" />
+  </packageSource>
+  <packageSource key="nuget.org">
+    <package pattern="*" />
+  </packageSource>
+</packageSourceMapping>
 </configuration>
diff --git a/Build/targets.fsx b/Build/targets.fsx
@@ -2184,7 +2184,7 @@ _Target "UnitTestWithAltCoverCoreRunner" (fun _ ->
                 XElement(
                     XName.Get "PackageReference",
                     XAttribute(XName.Get "Include", "altcover"),
-                    XAttribute(XName.Get "Version", Version.Value)
+                    XAttribute(XName.Get "VersionOverride", Version.Value)
                 )
 
             pack.AddBeforeSelf inject
@@ -4794,6 +4794,10 @@ _Target "Cake1Test" (fun _ ->
         let repo = config.Descendants(XName.Get("add")) |> Seq.head
 
         repo.SetAttributeValue(XName.Get "value", Path.getFullName "./_Packaging")
+        repo.SetAttributeValue(XName.Get "key", Path.getFullName "local")
+        let src = config.Descendants(XName.Get("packageSource")) |> Seq.head
+        src.SetAttributeValue(XName.Get "key", Path.getFullName "local")
+
         config.Save "./_Cake/_DotnetTest/NuGet.config"
 
         let fsproj = XDocument.Load "./Samples/Sample4/Sample4.fsproj"
@@ -4808,7 +4812,7 @@ _Target "Cake1Test" (fun _ ->
             XElement(
                 XName.Get "PackageReference",
                 XAttribute(XName.Get "Include", "altcover.api"),
-                XAttribute(XName.Get "Version", Version.Value)
+                XAttribute(XName.Get "VersionOverride", Version.Value)
             )
 
         pack.AddBeforeSelf inject
@@ -4819,16 +4823,13 @@ _Target "Cake1Test" (fun _ ->
         Shell.copy "./_Cake/_DotnetTest" (!! "./Samples/Sample4/*.json")
         Shell.copyDir "./_Cake/_DotnetTest/Data" "./Samples/Sample4/Data" File.Exists
 
-        let config =
-            """<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="local" value="{0}" />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-</configuration>"""
-
-        File.WriteAllText("./_Cake/NuGet.config", String.Format(config, Path.getFullName "./_Packaging.api"))
+        let config = XDocument.Load "./Build/NuGet.config.dotnettest"
+        let repo = config.Descendants(XName.Get("add")) |> Seq.head
+        repo.SetAttributeValue(XName.Get "value", Path.getFullName "./_Packaging.api")
+        repo.SetAttributeValue(XName.Get "key", "local")
+        let src = config.Descendants(XName.Get("packageSource")) |> Seq.head
+        src.SetAttributeValue(XName.Get "key", "local")
+        config.Save "./_Cake/NuGet.config"
 
         let script = File.ReadAllText("./Build/build.cake")
 
@@ -4929,7 +4930,7 @@ _Target "ApiUse" (fun _ ->
             XElement(
                 XName.Get "PackageReference",
                 XAttribute(XName.Get "Include", "altcover.api"),
-                XAttribute(XName.Get "Version", Version.Value),
+                XAttribute(XName.Get "VersionOverride", Version.Value),
                 XElement(XName.Get "PrivateAssets", "all"),
                 XElement(XName.Get "IncludeAssets", "build")
             )
@@ -5182,7 +5183,7 @@ _Target "DotnetTestIntegration" (fun _ ->
                 XElement(
                     XName.Get "PackageReference",
                     XAttribute(XName.Get "Include", "altcover"),
-                    XAttribute(XName.Get "Version", Version.Value)
+                    XAttribute(XName.Get "VersionOverride", Version.Value)
                 )
 
             pack.AddBeforeSelf inject
@@ -5644,7 +5645,7 @@ _Target "DotnetTestIntegration" (fun _ ->
             XElement(
                 XName.Get "PackageReference",
                 XAttribute(XName.Get "Include", "altcover"),
-                XAttribute(XName.Get "Version", Version.Value)
+                XAttribute(XName.Get "VersionOverride", Version.Value)
             )
 
         pack.AddBeforeSelf inject
@@ -5675,7 +5676,7 @@ _Target "DotnetTestIntegration" (fun _ ->
             XElement(
                 XName.Get "PackageReference",
                 XAttribute(XName.Get "Include", "altcover"),
-                XAttribute(XName.Get "Version", Version.Value)
+                XAttribute(XName.Get "VersionOverride", Version.Value)
             )
 
         pack.AddBeforeSelf inject
@@ -5739,7 +5740,7 @@ _Target "Issue20" (fun _ -> // plus added verbosity testing
             XElement(
                 XName.Get "PackageReference",
                 XAttribute(XName.Get "Include", "altcover"),
-                XAttribute(XName.Get "Version", Version.Value)
+                XAttribute(XName.Get "VersionOverride", Version.Value)
             )
 
         pack.AddBeforeSelf inject
@@ -5847,7 +5848,7 @@ _Target "Issue23" (fun _ ->
 
         // Bump the version
         Assert.That(pack.Attribute(XName.Get "Include").Value, Is.EqualTo "altcover")
-        pack.Attribute(XName.Get "Version").Value <- Version.Value
+        pack.Attribute(XName.Get "VersionOverride").Value <- Version.Value
         csproj.Save "./_Issue23/sample9.csproj"
         Shell.copy "./_Issue23" (!! "./Samples/Sample9/*.cs")
         Shell.copy "./_Issue23" (!! "./Samples/Sample9/*.json")
@@ -5908,7 +5909,7 @@ _Target "Issue67" (fun _ ->
 
         // Bump the version
         Assert.That(pack.Attribute(XName.Get "Include").Value, Is.EqualTo "altcover")
-        pack.Attribute(XName.Get "Version").Value <- Version.Value
+        pack.Attribute(XName.Get "VersionOverride").Value <- Version.Value
         csproj.Save "./_Issue67/sample9.csproj"
         Shell.copy "./_Issue67" (!! "./Samples/Sample9/*.cs")
         Shell.copy "./_Issue67" (!! "./Samples/Sample9/*.json")
@@ -5986,7 +5987,7 @@ _Target "Issue72" (fun _ -> // Confusing switch case coverage @ https://github.c
             XElement(
                 XName.Get "PackageReference",
                 XAttribute(XName.Get "Include", "altcover"),
-                XAttribute(XName.Get "Version", Version.Value)
+                XAttribute(XName.Get "VersionOverride", Version.Value)
             )
 
         pack.AddBeforeSelf inject
@@ -6128,6 +6129,12 @@ _Target "DotnetGlobalIntegration" (fun _ ->
     try
         Directory.ensure working
         Shell.cleanDir working
+        let config = XDocument.Load "./Build/NuGet.config.dotnettest"
+
+        let repo = config.Descendants(XName.Get("add")) |> Seq.head
+
+        repo.SetAttributeValue(XName.Get "value", Path.getFullName "./_Packaging.global")
+        config.Save "./_DotnetGlobalTest/NuGet.config"
 
         let fsproj = XDocument.Load "./Samples/Sample4/Sample4.fsproj"
 
@@ -6250,7 +6257,7 @@ _Target "Issue114" (fun _ ->
 
         // Bump API version
         Assert.That(pack.Attribute(XName.Get "Include").Value, Is.EqualTo "AltCover.Api")
-        pack.Attribute(XName.Get "Version").Value <- Version.Value
+        pack.Attribute(XName.Get "VersionOverride").Value <- Version.Value
         csproj.Save "./_Issue114/Sample26.fsproj"
         Shell.copy "./_Issue114" (!! "./Samples/Sample26/*.fs")
 
@@ -6311,7 +6318,7 @@ _Target "Issue156" (fun _ ->
             XElement(
                 XName.Get "PackageReference",
                 XAttribute(XName.Get "Include", "altcover"),
-                XAttribute(XName.Get "Version", Version.Value)
+                XAttribute(XName.Get "VersionOverride", Version.Value)
             )
 
         pack.AddBeforeSelf inject

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -25,6 +25,7 @@
     <PackageVersion Include="FsUnit" Version="5.0.5" />
     <PackageVersion Include="GtkSharp" Version="3.24.24.38" />
     <PackageVersion Include="Handlebars.Net" Version="2.0.9" />
+    <PackageVersion Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="16.0.461" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" />
@@ -35,6 +36,8 @@
     <PackageVersion Include="Mono.Cecil" Version="0.11.4" />
     <PackageVersion Include="Mono.CSharp" Version="4.0.0.143" />
     <PackageVersion Include="Mono.Options" Version="6.12.0.148" />
+    <PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageVersion Include="NuGet.CommandLine" Version="6.3.1" />
     <PackageVersion Include="NUnit" Version="3.13.3" />

diff --git a/RegressionTesting/Directory.Build.props b/RegressionTesting/Directory.Build.props
@@ -4,6 +4,11 @@
 
   <PropertyGroup>
     <DocumentationFile />
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+    <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
+    <!-- .nuget\packages\dotnet.reproduciblebuilds.isolated\x.x.x\Sdk\Sdk.targets -->
+    <EnsureNETFrameworkReferenceAssembliesProvided>false</EnsureNETFrameworkReferenceAssembliesProvided>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
 </Project>
diff --git a/RegressionTesting/issue156/ClassLibrary1/ClassLibrary1.csproj b/RegressionTesting/issue156/ClassLibrary1/ClassLibrary1.csproj
@@ -11,12 +11,5 @@
         <Reference Include="System.Windows.Forms" />
         <Reference Include="WindowsBase" />
     </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
+
 </Project>
diff --git a/RegressionTesting/issue156/Tests/Tests.csproj b/RegressionTesting/issue156/Tests/Tests.csproj
@@ -10,13 +10,9 @@
         <TestProjectType>UnitTest</TestProjectType>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="xunit.runner.console" Version="2.4.1" />
-        <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-        <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+        <PackageReference Include="xunit.runner.console" />
+        <PackageReference Include="MSTest.TestFramework" />
+        <PackageReference Include="MSTest.TestAdapter" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\ClassLibrary1\ClassLibrary1.csproj" />

diff --git a/RegressionTesting/issue20/classlib/classlib.csproj b/RegressionTesting/issue20/classlib/classlib.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/RegressionTesting/issue20/xunit-tests/xunit-tests.xml b/RegressionTesting/issue20/xunit-tests/xunit-tests.xml
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" VersionOverride="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/RegressionTesting/issue29/issue29.xml b/RegressionTesting/issue29/issue29.xml
@@ -7,13 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nunit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="nunit" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
 
 </Project>
diff --git a/RegressionTesting/issue37/issue37.xml b/RegressionTesting/issue37/issue37.xml
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nunit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="nunit" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/Sample16/Test/Test/Test.csproj b/Samples/Sample16/Test/Test/Test.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" VersionOverride="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>