clear config

PavelAltynnikov · Jun 27, 2022 · 1202253 · 1202253
1 parent b3e74ae
commit 1202253
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 11 deletions.
diff --git a/Installer/Installer.cs b/Installer/Installer.cs
@@ -54,7 +54,6 @@ WixEntity[] GenerateWixEntities()
     foreach (var directory in args)
     {
         var directoryInfo = new DirectoryInfo(directory);
-        Console.WriteLine(directoryInfo.FullName);
         var fileVersion = versionRegex.Match(directoryInfo.Name).Value;
         var files = new Files($@"{directory}\*.*");
         if (versionStorages.ContainsKey(fileVersion))

diff --git a/PythonConsoleControl/PythonConsoleControl.csproj b/PythonConsoleControl/PythonConsoleControl.csproj
@@ -3,7 +3,6 @@
     <Configurations>Debug;Release</Configurations>
     <PublishSingleFile>true</PublishSingleFile>
     <TargetFramework>net48</TargetFramework>
-    <RevitVersion>2022</RevitVersion>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>latest</LangVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

diff --git a/RevitPythonShell.sln b/RevitPythonShell.sln
@@ -63,7 +63,6 @@ Global
 		{0DF5F952-C36B-4C97-B0CD-678C61093311}.Release R22|Any CPU.ActiveCfg = Release|Any CPU
 		{0DF5F952-C36B-4C97-B0CD-678C61093311}.Release R23|Any CPU.ActiveCfg = Release|Any CPU
 		{0DF5F952-C36B-4C97-B0CD-678C61093311}.Installer|Any CPU.ActiveCfg = Release|Any CPU
-		{0DF5F952-C36B-4C97-B0CD-678C61093311}.Installer|Any CPU.Build.0 = Release|Any CPU
 		{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug R22|Any CPU.ActiveCfg = Debug|Any CPU
@@ -96,12 +95,12 @@ Global
 		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release R20|Any CPU.Build.0 = Release R20|Any CPU
 		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release R21|Any CPU.ActiveCfg = Release R21|Any CPU
 		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release R21|Any CPU.Build.0 = Release R21|Any CPU
-		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release R22|Any CPU.ActiveCfg = Release R21|Any CPU
-		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release R22|Any CPU.Build.0 = Release R21|Any CPU
 		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release R23|Any CPU.ActiveCfg = Release R23|Any CPU
 		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release R23|Any CPU.Build.0 = Release R23|Any CPU
 		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug R23|Any CPU.Build.0 = Debug R23|Any CPU
 		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Installer|Any CPU.ActiveCfg = Release R23|Any CPU
+		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release R22|Any CPU.ActiveCfg = Release R22|Any CPU
+		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release R22|Any CPU.Build.0 = Release R22|Any CPU
 		{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug|Any CPU.ActiveCfg = Debug R22|Any CPU
 		{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug|Any CPU.Build.0 = Debug R22|Any CPU
 		{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug R22|Any CPU.ActiveCfg = Debug R22|Any CPU

diff --git a/RevitPythonShell/RevitPythonShell.csproj b/RevitPythonShell/RevitPythonShell.csproj
@@ -11,13 +11,19 @@
     <Product>RevitPythonShell</Product>
     <Authors>RIPS</Authors>
     <Description>Revit Python Shell addin for Revit</Description>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <EnableDefaultItems>false</EnableDefaultItems>
     <Configurations>Debug R22;Debug R23</Configurations>
-    <Configurations>$(Configurations);Release R14;Release R15;Release R16;Release R17;Release R18;Release R19;Release R20;Release R21;Release R22;Release R23</Configurations>
+    <Configurations>$(Configurations);Release R18;Release R19;Release R20;Release R21;Release R22;Release R23</Configurations>
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.Contains('Debug'))">
+    <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
+    <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(Configuration.Contains('Release'))">
+    <Optimize>true</Optimize>
+    <DebugType>none</DebugType>
+    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.Contains('R18'))">
     <RevitVersion>2018</RevitVersion>
@@ -43,6 +49,14 @@
     <RevitVersion>2023</RevitVersion>
     <DefineConstants>$(DefineConstants);R23</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup>
+    <Version>$(RevitVersion)</Version>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <Description>The RevitPythonShell adds an IronPython interpreter to Autodesk Revit and Vasari.</Description>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishTrimmed>true</PublishTrimmed>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AvalonEdit" Version="6.0.1" />
   </ItemGroup>
@@ -214,6 +228,15 @@
       <ConfigItem Include="$(ProjectDir)DefaultConfig\*.*" />
       <AddinItem Include="$(TargetDir)*.*" />
     </ItemGroup>
+    <PropertyGroup>
+      <RootDir>bin\AddIn $(RevitVersion) $(Configuration)\</RootDir>
+      <AddinDir>$(RootDir)$(AssemblyName)\</AddinDir>
+    </PropertyGroup>
+
+    <Copy SourceFiles="@(RootItem)" DestinationFolder="$(RootDir)" />
+    <Copy SourceFiles="@(ConfigItem)" DestinationFolder="$(AddinDir)" />
+    <Copy SourceFiles="@(AddinItem)" DestinationFolder="$(AddinDir)" />
+
     <Copy SourceFiles="@(RootItem)" DestinationFolder="$(AppData)\Autodesk\Revit\Addins\$(RevitVersion)\%(RecursiveDir)" Condition="$(Configuration.Contains('Debug'))" />
     <Copy SourceFiles="@(AddinItem)" DestinationFolder="$(AppData)\Autodesk\Revit\Addins\$(RevitVersion)\$(AssemblyName)\%(RecursiveDir)" Condition="$(Configuration.Contains('Debug'))" />
     <Copy SourceFiles="@(ConfigItem)" DestinationFolder="$(AppData)\Autodesk\Revit\Addins\$(RevitVersion)\$(AssemblyName)\%(RecursiveDir)" Condition="$(Configuration.Contains('Debug'))" />

diff --git a/RpsRuntime/RpsRuntime.csproj b/RpsRuntime/RpsRuntime.csproj
@@ -7,11 +7,17 @@
         <EnableDefaultItems>false</EnableDefaultItems>
         <PlatformTarget>x64</PlatformTarget>
         <Configurations>Debug R22;Debug R23</Configurations>
-        <Configurations>$(Configurations);Release R14;Release R15;Release R16;Release R17;Release R18;Release R19;Release R20;Release R21;Release R22;Release R23</Configurations>
+        <Configurations>$(Configurations);Release R18;Release R19;Release R20;Release R21;Release R22;Release R23</Configurations>
     </PropertyGroup>
     <PropertyGroup Condition="$(Configuration.Contains('Debug'))">
-        <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+        <DebugSymbols>true</DebugSymbols>
         <DebugType>full</DebugType>
+        <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(Configuration.Contains('Release'))">
+        <Optimize>true</Optimize>
+        <DebugType>none</DebugType>
+        <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
     </PropertyGroup>
     <PropertyGroup Condition="$(Configuration.Contains('R18'))">
         <RevitVersion>2018</RevitVersion>

diff --git a/build/Build.Installer.cs b/build/Build.Installer.cs
@@ -22,7 +22,6 @@ internal partial class Build
              {
                  var directories = directoryGroup.ToList();
                  var exeArguments = BuildExeArguments(directories.Select(info => info.FullName).ToList());
-                 Console.WriteLine($"Exe Arguments:{exeArguments}");
                  var exeFile = installerProject.GetExecutableFile(configurations, directories);
                  if (string.IsNullOrEmpty(exeFile))
                  {

diff --git a/build/Build.cs b/build/Build.cs
@@ -58,7 +58,7 @@ private IEnumerable<IGrouping<string, DirectoryInfo>> GetBuildDirectories()
 
         var versionRegex = new Regex(@"^.*R\d+ ?");
         var addInsDirectory = directories
-            // .Where(dir => dir.Name.StartsWith(AddInBinPrefix))
+            .Where(dir => dir.Name.StartsWith(AddInBinPrefix))
             .Where(dir => dir.Name.Contains(BuildConfiguration))
             .GroupBy(dir => versionRegex.Replace(dir.Name, string.Empty));