Deployment fix (#182)

* Non-packable * Made attributes don't compile * Update publish.yaml * Update Draco.Compiler.csproj * Update Directory.Build.props
Draco-lang · Jan 16, 2023 · 4c877ce · 4c877ce
1 parent e0e68c8
commit 4c877ce
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 5 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -45,4 +45,4 @@ jobs:
         path: src/**/*${{ github.event.release.tag_name }}.nupkg
 
     - name: Upload to NuGet.org
-      run: dotnet nuget push src/**/*${{ github.event.release.tag_name }}.nupkg --api-key ${{ env.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json --no-symbols true
+      run: dotnet nuget push src/**/*${{ github.event.release.tag_name }}.nupkg --api-key ${{ env.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json --no-symbols
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>0.1.0-pre</Version>
+    <Version>0.1.1-pre</Version>
     <DracoToolsTargetFramework>net7.0</DracoToolsTargetFramework>
   </PropertyGroup>
 

diff --git a/src/Draco.Compiler.Cli/Draco.Compiler.Cli.csproj b/src/Draco.Compiler.Cli/Draco.Compiler.Cli.csproj
@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>$(DracoToolsTargetFramework)</TargetFramework>
     <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
 
     <!-- This needs to be false for the packaging logic in Draco.Compiler.Toolset.
           We don't expect Draco.Compiler.Cli to be invoked directly. -->

diff --git a/src/Draco.Compiler.Tasks/Draco.Compiler.Tasks.csproj b/src/Draco.Compiler.Tasks/Draco.Compiler.Tasks.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>11</LangVersion>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Draco.Compiler/Draco.Compiler.csproj b/src/Draco.Compiler/Draco.Compiler.csproj
@@ -18,7 +18,10 @@
     </PackageReference>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
 
-    <ProjectReference Include="..\Draco.RedGreenTree.Attributes\Draco.RedGreenTree.Attributes.csproj" />
+    <ProjectReference Include="..\Draco.RedGreenTree.Attributes\Draco.RedGreenTree.Attributes.csproj">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </ProjectReference>
     <ProjectReference Include="..\Draco.RedGreenTree.SourceGenerator\Draco.RedGreenTree.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="False" />
   </ItemGroup>
 

diff --git a/src/Draco.RedGreenTree.Attributes/GreenTreeAttribute.cs b/src/Draco.RedGreenTree.Attributes/GreenTreeAttribute.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Diagnostics;
 
 namespace Draco.RedGreenTree.Attributes;
 
+[Conditional("DRACO_SOURCEGENERATOR_ATTRIBUTE")]
 [AttributeUsage(AttributeTargets.Class)]
 public sealed class GreenTreeAttribute : Attribute
 {

diff --git a/src/Draco.RedGreenTree.Attributes/IgnoreAttribute.cs b/src/Draco.RedGreenTree.Attributes/IgnoreAttribute.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 
 namespace Draco.RedGreenTree.Attributes;
 
@@ -11,6 +12,7 @@ public enum IgnoreFlags
     SyntaxFactoryConstruct = 1 << 3,
 }
 
+[Conditional("DRACO_SOURCEGENERATOR_ATTRIBUTE")]
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Class)]
 public sealed class IgnoreAttribute : Attribute
 {

diff --git a/src/Draco.RedGreenTree.Attributes/RedTreeAttribute.cs b/src/Draco.RedGreenTree.Attributes/RedTreeAttribute.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Diagnostics;
 
 namespace Draco.RedGreenTree.Attributes;
 
+[Conditional("DRACO_SOURCEGENERATOR_ATTRIBUTE")]
 [AttributeUsage(AttributeTargets.Class)]
 public sealed class RedTreeAttribute : Attribute
 {

diff --git a/src/Draco.RedGreenTree.Attributes/SyntaxFactoryAttribute.cs b/src/Draco.RedGreenTree.Attributes/SyntaxFactoryAttribute.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Diagnostics;
 
 namespace Draco.RedGreenTree.Attributes;
 
+[Conditional("DRACO_SOURCEGENERATOR_ATTRIBUTE")]
 [AttributeUsage(AttributeTargets.Class)]
 public sealed class SyntaxFactoryAttribute : Attribute
 {

diff --git a/src/Draco.RedGreenTree.Attributes/TransformerBaseAttribute.cs b/src/Draco.RedGreenTree.Attributes/TransformerBaseAttribute.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Diagnostics;
 
 namespace Draco.RedGreenTree.Attributes;
 
+[Conditional("DRACO_SOURCEGENERATOR_ATTRIBUTE")]
 [AttributeUsage(AttributeTargets.Class)]
 public sealed class TransformerBaseAttribute : Attribute
 {

diff --git a/src/Draco.RedGreenTree.Attributes/VisitorBaseAttribute.cs b/src/Draco.RedGreenTree.Attributes/VisitorBaseAttribute.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Diagnostics;
 
 namespace Draco.RedGreenTree.Attributes;
 
+[Conditional("DRACO_SOURCEGENERATOR_ATTRIBUTE")]
 [AttributeUsage(AttributeTargets.Class)]
 public sealed class VisitorBaseAttribute : Attribute
 {