Update net7.0-windows framework

ricaun-io · Nov 21, 2023 · 72fa843 · 72fa843
1 parent 2b27453
commit 72fa843
Show file tree

Hide file tree

Showing 19 changed files with 495 additions and 33 deletions.
diff --git a/Build/IBuildConsole.cs b/Build/IBuildConsole.cs
@@ -41,7 +41,13 @@ public interface IBuildConsole : IHazExample, IRevitPackageBuilder
                 {
                     var resourcesDirectory = projectTestAdapter.Directory / "Resources";
                     Serilog.Log.Information($"Copy Exe: {file} to {resourcesDirectory}");
-                    FileSystemTasks.CopyFileToDirectory(file, resourcesDirectory, FileExistsPolicy.OverwriteIfNewer);
+
+                    var directory = file.Parent;
+                    var resourceNet = resourcesDirectory / directory.Name;
+                    resourceNet.DeleteDirectory();
+
+                    var zipPath = resourceNet / file.Name;
+                    ZipExtension.CreateFromDirectory(directory, zipPath);
                 });
 
             Solution.BuildProject(projectTestAdapter, (project) =>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,8 +10,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Application
 - Add `EnsureApsUserHaveOpenId` to make sure `OpenId` has data.
 - Update `net7.0-windows` for Revit 2025.
+- Update `csproj`.
 ### Shared
 - Update `net6.0-windows` framework.
+### Console
+- Update `net7.0-windows` framework.
+- Update `csproj`.
+### Build
+- Update `net48` and `net7.0-windows` console zip.
+### TestAdapter
+- Select resource console zip for NetFramework and NetCore.
+- Update `ResourceConsoleUtils`
 
 ## [1.2.0] / 2023-10-28
 ### Features

diff --git a/ricaun.RevitTest.Application/ricaun.RevitTest.Application.csproj b/ricaun.RevitTest.Application/ricaun.RevitTest.Application.csproj
@@ -13,6 +13,12 @@
     </Configurations>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('net7'))">
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+
   <!-- RevitVersion -->
   <PropertyGroup>
     <TargetFrameworks>net46;net7.0-windows</TargetFrameworks>

diff --git a/ricaun.RevitTest.Console/Resources/ricaun.RevitTest.Application.bundle.zip b/ricaun.RevitTest.Console/Resources/ricaun.RevitTest.Application.bundle.zip
diff --git a/ricaun.RevitTest.Console/Revit/Utils/VisualStudioDebugUtils.cs b/ricaun.RevitTest.Console/Revit/Utils/VisualStudioDebugUtils.cs
@@ -44,6 +44,7 @@ internal static EnvDTE.Process GetProcessDTE(this System.Diagnostics.Process pro
 
         internal static DTE GetDTE(int versionMax = 23, int versionMin = 9)
         {
+#if NETFRAMEWORK
             for (int i = versionMax; i >= versionMin; i--)
             {
                 try
@@ -58,6 +59,7 @@ internal static DTE GetDTE(int versionMax = 23, int versionMin = 9)
                 }
                 catch { }
             }
+#endif
             return null;
         }
 

diff --git a/ricaun.RevitTest.Console/ricaun.RevitTest.Console.csproj b/ricaun.RevitTest.Console/ricaun.RevitTest.Console.csproj
@@ -2,13 +2,19 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFrameworks>net48;net7.0-windows</TargetFrameworks>
     <LangVersion>latest</LangVersion>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
-  <!-- Release -->
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('net7'))">
+    <EnableDynamicLoading>false</EnableDynamicLoading>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+
+    <!-- Release -->
   <PropertyGroup Condition="!$(Configuration.Contains('Debug'))">
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
@@ -50,10 +56,6 @@
     <ProjectReference Include="..\ricaun.RevitTest.Shared\ricaun.RevitTest.Shared.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="System.Web.Extensions" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

diff --git a/ricaun.RevitTest.TestAdapter/Properties/NetCore/Resources.Designer.cs b/ricaun.RevitTest.TestAdapter/Properties/NetCore/Resources.Designer.cs
diff --git a/ricaun.RevitTest.TestAdapter/Properties/NetCore/Resources.resx b/ricaun.RevitTest.TestAdapter/Properties/NetCore/Resources.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="ricaun_RevitTest_Console" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\..\Resources\net7.0-windows\ricaun.RevitTest.Console.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+</root>
diff --git a/ricaun.RevitTest.TestAdapter/Properties/NetFramework/Resources.Designer.cs b/ricaun.RevitTest.TestAdapter/Properties/NetFramework/Resources.Designer.cs