Switch to trusted publishing (#431)

.github/workflows/dotnet.yaml

@@ -301,12 +301,17 @@ jobs:
       - name: Identify `dotnet`
         id: dotnet-identify
         run: nix develop --command bash -c 'echo "dotnet=$(which dotnet)" >> $GITHUB_OUTPUT'
+      - name: Obtain NuGet key
+        uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544
+        id: login
+        with:
+            user: ${{ secrets.NUGET_USER }}
       - name: Publish to NuGet
         id: publish-success
         uses: G-Research/common-actions/publish-nuget@2b7dc49cb14f3344fbe6019c14a31165e258c059
         with:
           package-name: WoofWare.Myriad.Plugins.Attributes
-          nuget-key: ${{ secrets.NUGET_API_KEY }}
+          nuget-key: ${{ steps.login.outputs.NUGET_API_KEY }}
           nupkg-dir: packed/
           dotnet: ${{ steps.dotnet-identify.outputs.dotnet }}
 
@@ -334,12 +339,17 @@ jobs:
       - name: Identify `dotnet`
         id: dotnet-identify
         run: nix develop --command bash -c 'echo "dotnet=$(which dotnet)" >> $GITHUB_OUTPUT'
+      - name: Obtain NuGet key
+        uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544
+        id: login
+        with:
+            user: ${{ secrets.NUGET_USER }}
       - name: Publish to NuGet
         id: publish-success
         uses: G-Research/common-actions/publish-nuget@2b7dc49cb14f3344fbe6019c14a31165e258c059
         with:
           package-name: WoofWare.Myriad.Plugins
-          nuget-key: ${{ secrets.NUGET_API_KEY }}
+          nuget-key: ${{ steps.login.outputs.NUGET_API_KEY }}
           nupkg-dir: packed/
           dotnet: ${{ steps.dotnet-identify.outputs.dotnet }}
 

ConsumePlugin/GeneratedCapturingMock.fs

@@ -37,7 +37,7 @@ type internal PublicTypeMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : PublicTypeMock =
+    static member Empty () : PublicTypeMock =
         {
             Calls = PublicTypeMockCalls.Calls.Empty ()
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -90,7 +90,7 @@ type public PublicTypeInternalFalseMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : PublicTypeInternalFalseMock =
+    static member Empty () : PublicTypeInternalFalseMock =
         {
             Calls = PublicTypeInternalFalseMockCalls.Calls.Empty ()
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -140,7 +140,7 @@ type internal InternalTypeMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : InternalTypeMock =
+    static member Empty () : InternalTypeMock =
         {
             Calls = InternalTypeMockCalls.Calls.Empty ()
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -185,7 +185,7 @@ type private PrivateTypeMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : PrivateTypeMock =
+    static member Empty () : PrivateTypeMock =
         {
             Calls = PrivateTypeMockCalls.Calls.Empty ()
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -230,7 +230,7 @@ type private PrivateTypeInternalFalseMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : PrivateTypeInternalFalseMock =
+    static member Empty () : PrivateTypeInternalFalseMock =
         {
             Calls = PrivateTypeInternalFalseMockCalls.Calls.Empty ()
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -487,7 +487,7 @@ type internal TypeWithInterfaceMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : TypeWithInterfaceMock =
+    static member Empty () : TypeWithInterfaceMock =
         {
             Calls = TypeWithInterfaceMockCalls.Calls.Empty ()
             Dispose = (fun () -> ())
@@ -541,7 +541,7 @@ type internal TypeWithPropertiesMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : TypeWithPropertiesMock =
+    static member Empty () : TypeWithPropertiesMock =
         {
             Calls = TypeWithPropertiesMockCalls.Calls.Empty ()
             Dispose = (fun () -> ())

ConsumePlugin/GeneratedCapturingMockNoAttributes.fs

@@ -36,7 +36,7 @@ type internal PublicTypeNoAttrMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : PublicTypeNoAttrMock =
+    static member Empty () : PublicTypeNoAttrMock =
         {
             Calls = PublicTypeNoAttrMockCalls.Calls.Empty ()
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -88,7 +88,7 @@ type public PublicTypeInternalFalseNoAttrMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : PublicTypeInternalFalseNoAttrMock =
+    static member Empty () : PublicTypeInternalFalseNoAttrMock =
         {
             Calls = PublicTypeInternalFalseNoAttrMockCalls.Calls.Empty ()
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -137,7 +137,7 @@ type internal InternalTypeNoAttrMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : InternalTypeNoAttrMock =
+    static member Empty () : InternalTypeNoAttrMock =
         {
             Calls = InternalTypeNoAttrMockCalls.Calls.Empty ()
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -181,7 +181,7 @@ type private PrivateTypeNoAttrMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : PrivateTypeNoAttrMock =
+    static member Empty () : PrivateTypeNoAttrMock =
         {
             Calls = PrivateTypeNoAttrMockCalls.Calls.Empty ()
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -225,7 +225,7 @@ type private PrivateTypeInternalFalseNoAttrMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : PrivateTypeInternalFalseNoAttrMock =
+    static member Empty () : PrivateTypeInternalFalseNoAttrMock =
         {
             Calls = PrivateTypeInternalFalseNoAttrMockCalls.Calls.Empty ()
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -479,7 +479,7 @@ type internal TypeWithInterfaceNoAttrMock =
     }
 
     /// An implementation where every non-unit method throws.
-    static member Empty : TypeWithInterfaceNoAttrMock =
+    static member Empty () : TypeWithInterfaceNoAttrMock =
         {
             Calls = TypeWithInterfaceNoAttrMockCalls.Calls.Empty ()
             Dispose = (fun () -> ())

README.md

@@ -652,13 +652,13 @@ For example, [PureGymDto.fs](./ConsumePlugin/PureGymDto.fs) is a real-world set
 * In your `.fsproj` file, define a helper variable so that subsequent steps don't all have to be kept in sync:
     ```xml
     <PropertyGroup>
-      <WoofWareMyriadPluginVersion>2.0.1</WoofWareMyriadPluginVersion>
+      <WoofWareMyriadPluginVersion>9.0.1</WoofWareMyriadPluginVersion>
     </PropertyGroup>
     ```
 * Take a reference on `WoofWare.Myriad.Plugins.Attributes` (which has no other dependencies), to obtain access to the attributes which the generator will recognise:
     ```xml
     <ItemGroup>
-        <PackageReference Include="WoofWare.Myriad.Plugins.Attributes" Version="2.0.2" />
+        <PackageReference Include="WoofWare.Myriad.Plugins.Attributes" Version="3.7.2" />
     </ItemGroup>
     ```
 * Take a reference (with private assets, to prevent these from propagating to your own assembly) on `WoofWare.Myriad.Plugins`, to obtain the plugins which Myriad will run, and on `Myriad.Sdk`, to obtain the Myriad binary itself:

WoofWare.Myriad.Plugins.Test/TestCapturingMockGenerator/TestCapturingMockGenerator.fs

@@ -11,7 +11,7 @@ module TestCapturingMockGenerator =
     [<Test>]
     let ``Example of use: IPublicType`` () =
         let mock : IPublicType =
-            { PublicTypeMock.Empty with
+            { PublicTypeMock.Empty () with
                 Mem1 = fun (s, count) -> List.replicate count s
             }
             :> _
@@ -38,7 +38,7 @@ module TestCapturingMockGenerator =
     [<Test>]
     let ``Example of use: properties`` () =
         let mock : TypeWithProperties =
-            { TypeWithPropertiesMock.Empty with
+            { TypeWithPropertiesMock.Empty () with
                 Mem1 = fun i -> async { return Option.toArray i }
                 Prop1 = fun () -> 44
             }

WoofWare.Myriad.Plugins.Test/TestCapturingMockGenerator/TestCapturingMockGeneratorNoAttr.fs

@@ -11,7 +11,7 @@ module TestCapturingMockGeneratorNoAttr =
     [<Test>]
     let ``Example of use: IPublicType`` () =
         let mock : IPublicTypeNoAttr =
-            { PublicTypeNoAttrMock.Empty with
+            { PublicTypeNoAttrMock.Empty () with
                 Mem1 = fun (s, count) -> List.replicate count s
             }
             :> _

WoofWare.Myriad.Plugins/CapturingInterfaceMockGenerator.fs

@@ -273,10 +273,7 @@ module internal CapturingInterfaceMockGenerator =
         let staticMemberEmpty =
             SynBinding.basic
                 [ Ident.create "Empty" ]
-                (if interfaceType.Generics.IsNone then
+                [ SynPat.unit ]
-                     []
-                 else
-                     [ SynPat.unit ])
                 (SynExpr.createRecord None emptyRecordFieldInstantiations)
             |> SynBinding.withXmlDoc (PreXmlDoc.create "An implementation where every non-unit method throws.")
             |> SynBinding.withReturnAnnotation constructorReturnType

WoofWare.Myriad.Plugins/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.1",
+  "version": "9.0",
   "publicReleaseRefSpec": [
     "^refs/heads/main$"
   ],