Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CNX-9308 CNX-9632 Moving to Github Actions for DUI3 #3418

Merged
merged 129 commits into from
May 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
df1134b
test: Build into `dist/` folder
AlanRynne May 6, 2024
af7a134
test: Only do so on CI
AlanRynne May 6, 2024
2cc5d97
test: Zipping output to dist/zip
AlanRynne May 6, 2024
7e3d429
test: Super simple github action
AlanRynne May 6, 2024
eb67ea7
test: dotnet msbuild
AlanRynne May 6, 2024
0b71b88
test: Just speeding it up by skipping steps 🙂
AlanRynne May 6, 2024
e38b7f8
test: Too much
AlanRynne May 6, 2024
7b1abff
temp: Silence Core and Objects warnings in CI for now
AlanRynne May 7, 2024
aded3d5
fix: Do only on CI
AlanRynne May 7, 2024
d2d635a
test warn as error in github
AlanRynne May 7, 2024
b9cbe51
test: GitVersion this thing!
AlanRynne May 8, 2024
228e26f
fix: Dotnet-version
AlanRynne May 8, 2024
55bf0bd
fetch depth of 0
AlanRynne May 8, 2024
72a14ca
fix: Removed invalid configurations
AlanRynne May 8, 2024
6f6e26f
fix long restore?
AlanRynne May 8, 2024
aa076df
just archive the entire zip folder
AlanRynne May 8, 2024
7a19ac6
use normal nuget?
AlanRynne May 8, 2024
f1d9fc8
restore all.sln
AlanRynne May 8, 2024
dc73ade
Merge branch 'dui3/alpha' into dui3/ci/github-actions-test
AlanRynne May 8, 2024
14b1888
use msbuild restore?
AlanRynne May 8, 2024
d68d3ce
teaks to target
AlanRynne May 8, 2024
5db7226
no zipping
AlanRynne May 8, 2024
8eb0471
restore using lock files test
AlanRynne May 8, 2024
e8d5efb
minor tweaks
AlanRynne May 8, 2024
c0757a3
match to fallback key if nuget cache is not found
AlanRynne May 8, 2024
bb0cd46
run restore in lock mode, don't skip
AlanRynne May 8, 2024
4f32553
update gitversion and lock files
AlanRynne May 8, 2024
1be25c5
fix: update lock files
AlanRynne May 8, 2024
713c713
no gitversion 🥲
AlanRynne May 8, 2024
623cf71
even less :D
AlanRynne May 8, 2024
f8df726
no cache and use global.json
AlanRynne May 8, 2024
6bf6d8a
rel path
AlanRynne May 8, 2024
45011c8
AlanRynne May 8, 2024
bf9b554
🔓
AlanRynne May 8, 2024
5871590
build testing: try adding back cache with no restore (#3395)
adamhathcock May 15, 2024
9b8d579
Merge branch 'dui3/alpha' into dui3/ci/github-actions-test
adamhathcock May 15, 2024
8049f79
update packages
adamhathcock May 15, 2024
8505d5b
add minver
adamhathcock May 15, 2024
21b90cc
remove minver changes
adamhathcock May 15, 2024
e246680
turn off locked mode
adamhathcock May 15, 2024
fa76ce8
add verison CLI
adamhathcock May 15, 2024
cdc1b73
fmt
adamhathcock May 15, 2024
7f386fa
add version test
adamhathcock May 15, 2024
7be5d0d
fix build
adamhathcock May 15, 2024
b920621
trim the value
adamhathcock May 15, 2024
dade130
fix format?
adamhathcock May 15, 2024
7ac7bb9
rogue space
adamhathcock May 15, 2024
74f2209
try GitVersion
adamhathcock May 15, 2024
c0c6843
fix versions
adamhathcock May 15, 2024
19fdf9e
add back posting version
adamhathcock May 15, 2024
9cc1d9e
Use different version for file version
adamhathcock May 15, 2024
edbb08e
update autocad converters to net48 and add back locked mode restore
adamhathcock May 15, 2024
d13857e
remove permissions
adamhathcock May 15, 2024
0581ae6
remove some temp gibbens
adamhathcock May 15, 2024
43f4511
add back circle ci
adamhathcock May 15, 2024
dc6629d
add back t4
adamhathcock May 15, 2024
5ceffc5
remove some spaces to be exact
adamhathcock May 15, 2024
02dd99f
add test workflow
adamhathcock May 15, 2024
9868da1
change test name
adamhathcock May 15, 2024
3a99388
add dependabot
adamhathcock May 15, 2024
d0351ff
trigger real output job
adamhathcock May 16, 2024
b477bc3
retrigger test with newer vals
adamhathcock May 16, 2024
e3ac302
print out what is zipped
adamhathcock May 16, 2024
ed30ecb
remove RuntimeIdentifier from ArcGIS3
adamhathcock May 16, 2024
a936ba0
Revert "remove RuntimeIdentifier from ArcGIS3"
adamhathcock May 16, 2024
804fa61
Merge branch 'dui3/alpha' into dui3/ci/github-actions-test
adamhathcock May 21, 2024
08c9585
merge fixes
adamhathcock May 21, 2024
4bae07d
DUI3 with locked mode and msbuild
adamhathcock May 21, 2024
3bc1bf8
Merge branch 'dui3/alpha' into dui3/ci/github-actions-test
adamhathcock May 21, 2024
c16343e
fix up package locking
adamhathcock May 21, 2024
c889b16
move the explicit format
adamhathcock May 21, 2024
65edeaa
Merge remote-tracking branch 'origin/dui3/alpha' into dui3/ci/github-…
adamhathcock May 21, 2024
9c7377f
trigger build
adamhathcock May 21, 2024
68670f0
Merge remote-tracking branch 'origin/dui3/alpha' into dui3/ci/github-…
adamhathcock May 21, 2024
27fec08
Merge remote-tracking branch 'origin/dui3/alpha' into dui3/ci/github-…
adamhathcock May 24, 2024
cceee58
feat: Modify ZIP build target to use a nested folder per connector
AlanRynne May 24, 2024
8b52f5b
ci: Trigger build on PR push
AlanRynne May 24, 2024
83108e3
Allow manual triggering
AlanRynne May 24, 2024
95d2f20
ci: Updated run ID for test run
AlanRynne May 24, 2024
9310c86
test on push to DUI3/alpha
AlanRynne May 24, 2024
29abb85
ci: Back to trigger on PR
AlanRynne May 24, 2024
cf4537f
ci: Use test in ubuntu, may be faster
AlanRynne May 24, 2024
68a2126
Update test variables
AlanRynne May 24, 2024
58a2e70
ci: Fix case sensitive csproj path
AlanRynne May 24, 2024
bd4e7e5
fix trigger on main.yml
AlanRynne May 24, 2024
572919e
ci: Do not keep parent directory when zipping
AlanRynne May 24, 2024
2cc0ecc
ci: Run main on CI to update artifacts
AlanRynne May 24, 2024
3e7758c
ci: Copy files respecting nested folder + autocad slug change
AlanRynne May 24, 2024
c6fa641
fix: Remove .zip from artifact file name
AlanRynne May 27, 2024
690287c
fix: GitVersion use fullSemVer for informational version
AlanRynne May 27, 2024
6f738a0
ci: Check if version tag with . is breaking feed upload
AlanRynne May 27, 2024
ae0d739
feat: Cleanup of github action + gitversion tag setup
AlanRynne May 28, 2024
5f4e413
trigger on PR to dui3/alpha as well
AlanRynne May 28, 2024
38dab97
chore: Update packages.lock.json files
AlanRynne May 28, 2024
4cbc3cf
fix: GitVersion prefixes aligned with our decided workflow
AlanRynne May 28, 2024
652674e
Revert "chore: Update packages.lock.json files"
AlanRynne May 28, 2024
680d9da
rolled back alpha PR suffix, must have convo about this
AlanRynne May 28, 2024
eaf0c03
Test workflow should be manually triggered only.
AlanRynne May 28, 2024
8842741
ci: Further specified CI and release workflows
AlanRynne May 28, 2024
97d352b
ci: Test workflow dispatch action that will await result
AlanRynne May 28, 2024
b67fcb1
Trigger into `main`
AlanRynne May 28, 2024
18df032
ci: Test waiting workflow in main job
AlanRynne May 28, 2024
22354fd
ci: Faster polling for installers start/finish state
AlanRynne May 28, 2024
97a7e17
ci: Adjusted timeouts for connector-installer wait call
AlanRynne May 28, 2024
d121fa5
ci: Split main job into build + deploy jobs
AlanRynne May 28, 2024
714b76e
ci: Obviously powershell getting in the way 🤦🏼‍♂️
AlanRynne May 28, 2024
300086d
ci: Remove test workflow
AlanRynne May 28, 2024
e691da7
ci: Fix on pull request trigger
AlanRynne May 28, 2024
f3e87cb
ci: Default pull request trigger
AlanRynne May 28, 2024
e8ba341
fix: Release triggeres
AlanRynne May 28, 2024
2c5a224
fix: Enable builds on all platforms
AlanRynne May 28, 2024
8ebab12
chore: Stop restoring with lock file
AlanRynne May 28, 2024
cc09945
ci: Unified CI build job and reused for deploy
AlanRynne May 28, 2024
6946003
fix: Restore without lock
AlanRynne May 28, 2024
575edd2
ci: Added run-name
AlanRynne May 28, 2024
f3a1f40
ci: Fixes for linux run
AlanRynne May 28, 2024
138be5f
ci: Run on windows but keep dotnet
AlanRynne May 28, 2024
4c2af0c
ci: Wire up dependent jobs and consolidate in single CI step
AlanRynne May 28, 2024
359c212
test: run gitversion as part of bullseye target
AlanRynne May 28, 2024
fd3a332
fix: Correct gitversion tool command
AlanRynne May 28, 2024
cb9e3f7
fix: Use gitversion_ prefixed env vars
AlanRynne May 28, 2024
35fa0e6
test: Fix slow restore by disabling setting
AlanRynne May 28, 2024
df31ba5
try offline revocation check insted
AlanRynne May 28, 2024
acd3a3d
Merge branch 'dui3/alpha' into dui3/ci/github-actions-test
AlanRynne May 28, 2024
abb0de2
ci: Removed CircleCI dui3 pipeline
AlanRynne May 28, 2024
31ae66c
Merge remote-tracking branch 'origin/dui3/ci/github-actions-test' int…
AlanRynne May 28, 2024
0527a90
ci: Removed commented out parts
AlanRynne May 28, 2024
ffa6cec
Revert WarningsNotAsErrors in Core and Objects
AlanRynne May 28, 2024
d332f7d
Merge branch 'dui3/alpha' into dui3/ci/github-actions-test
AlanRynne May 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Enable builds on all platforms
AlanRynne committed May 28, 2024
commit 2c5a2245b9ed1f7439fa8ae82233226be5a3e9e0
Original file line number Diff line number Diff line change
@@ -0,0 +1,352 @@
<?xml version="1.0" encoding="utf-8" ?>
<Project>
<!-- Code to zip up the files-->

<UsingTask TaskName="PackageAddIn" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
<ParameterGroup>
<ZipIntermediatePath ParameterType="System.String" Required="true" />
<PackageType ParameterType="System.String" Required="true" />
<TargetFolder ParameterType="System.String" Required="true" />
<TargetFileName ParameterType="System.String" Required="true" />
<RootNamespace ParameterType="System.String" Required="true" />
<PackageOutputPath ParameterType="System.String" Output="true"/>
</ParameterGroup>
<Task>
<Using Namespace="System"/>
<Using Namespace="System.IO"/>
<Using Namespace="System.Xml.Linq"/>
<Using Namespace="System.Linq"/>
<Using Namespace="System.IO.Compression"/>
<Code Type="Fragment" Language="cs">
<![CDATA[
Success = false;
string ConfigNotFound = "{0} was not found. File must be present in the root of the project and its build action set to AddInContent.";
string ZipIntermediatePathNotFound = "{0} was not found.";
string DefaultAssemblyDoesNotMatch = "Your value of '{0}' for the '{1}' attribute in the {2} does not match the assembly name '{3}' set for your project.";
string DefaultNSDoesNotMatch = "Your value of '{0}' for the '{1}' attribute in the {2} does not match the default namespace '{3}' set for your project.";
//Create the name of the Config File and extension
string extension = "";
string config = "";
string attrib_asm = "";
string attrib_ns = "";
var assemblyValMissing = "";
var nsValMissing = "";
if (PackageType.ToLower() == "plugin")
{
Log.LogMessage(MessageImportance.Low, "This is an plugin");
config = "Config.xml";
extension = ".esriPlugin";
attrib_asm = "library";
attrib_ns = "namespace";
assemblyValMissing = "AddIn element 'library' attribute not found";
nsValMissing = "AddIn element 'namespace' attribute not found";
}
else if (PackageType.ToLower() == "configuration")
{
Log.LogMessage(MessageImportance.Low, "This is an configuration");
config = "Config.daml";
extension = ".proConfigX";
attrib_asm = "defaultAssembly";
attrib_ns = "defaultNamespace";
assemblyValMissing = "ArcGIS element 'defaultAssembly' attribute not found";
nsValMissing = "ArcGIS element 'defaultNamespace' attribute not found";
}
else
{
Log.LogMessage(MessageImportance.Low, "This is an addin");
config = "Config.daml";
bool proSDKProject = File.Exists(Path.Combine(ZipIntermediatePath, config));
if (!proSDKProject) //This might be a class library that uses the Pro references only
return true;
extension = ".esriAddinX";
attrib_asm = "defaultAssembly";
attrib_ns = "defaultNamespace";
assemblyValMissing = "ArcGIS element 'defaultAssembly' attribute not found";
nsValMissing = "ArcGIS element 'defaultNamespace' attribute not found";
}
// Check if Config.daml exists in ZipFolder
ZipIntermediatePath = Path.GetFullPath(ZipIntermediatePath);
if (!Directory.Exists(ZipIntermediatePath))
{
Log.LogError(ZipIntermediatePathNotFound, ZipIntermediatePath);
return false;
}
var addInXML = Path.Combine(ZipIntermediatePath, config);
Log.LogMessage(MessageImportance.Low, "addInXML: " + addInXML);
Log.LogMessage(MessageImportance.High, "PackageType: " + PackageType);
if (!File.Exists(addInXML))
{
Log.LogError(ConfigNotFound, config);
return false;
}
//Verfiy that an assembly with the name defined in the Config.daml
//matches the default assembly set in the project. Ditto for the
//namespace
string DefaultAssembly = "";
string DefaultNamespace = "";
XDocument xdoc = XDocument.Load(addInXML);
XNamespace DefaultNS = "http://schemas.esri.com/DADF/Registry";
if (PackageType.ToLower() == "plugin")
{
var addin = xdoc.Root.Element(DefaultNS + "AddIn");
if (addin != null)
{
var val = addin.Attribute("library");
if (val != null)
DefaultAssembly = val.Value;
val = addin.Attribute("namespace");
if (val != null)
DefaultNamespace = val.Value;
}
}
else
{
var val = xdoc.Root.Attribute("defaultAssembly");
if (val != null)
DefaultAssembly = val.Value;
val = xdoc.Root.Attribute("defaultNamespace");
if (val != null)
DefaultNamespace = val.Value;
}
if (string.IsNullOrEmpty(DefaultAssembly))
{
Log.LogError(assemblyValMissing);
return false;
}
if (string.IsNullOrEmpty(DefaultNamespace))
{
Log.LogError(nsValMissing);
return false;
}

//check that the addin assembly and default assembly names match
if (DefaultAssembly.ToLower() != TargetFileName.ToLower())
{
Log.LogWarning(DefaultAssemblyDoesNotMatch, DefaultAssembly, attrib_asm, config, TargetFileName);
}
//Ditto for namespace
if (DefaultNamespace.ToLower() != RootNamespace.ToLower())
{
Log.LogWarning(DefaultNSDoesNotMatch, DefaultNamespace, attrib_ns, config, RootNamespace);
}

if (!Directory.Exists(TargetFolder))
{
Directory.CreateDirectory(TargetFolder);
}

string addInAssembly = System.IO.Path.GetFileNameWithoutExtension(DefaultAssembly);
string archiveName = addInAssembly + extension;
try
{
string file = Path.Combine(TargetFolder, archiveName);
if (File.Exists(file))
File.Delete(file);
System.IO.Compression.ZipFile.CreateFromDirectory(ZipIntermediatePath, file);
PackageOutputPath = Path.GetFullPath(file);
Success = true;
}
catch (Exception ex)
{
Log.LogErrorFromException(ex);
return false;
}
return Success;
]]>
</Code>
</Task>
</UsingTask>
<!-- Code to find relative path-->
<UsingTask TaskName="ConvertToRelativePath" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
<ParameterGroup>
<RelativeTo ParameterType="System.String" Required="true"/>
<Paths ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
<RelativePaths ParameterType="Microsoft.Build.Framework.ITaskItem[]" Output="true"/>
</ParameterGroup>
<Task>
<Using Namespace="System"/>
<Using Namespace="System.IO"/>
<Using Namespace="System.Linq"/>
<Code Type="Fragment" Language="cs">
<![CDATA[
var result = new List<ITaskItem>();
System.Uri relativeTo = new Uri(this.RelativeTo);
foreach (var i in Paths) {
try {
System.Uri itemFullPath = new Uri(i.GetMetadata("FullPath"));
var relativeUri = relativeTo.MakeRelativeUri(itemFullPath);

result.Add(new TaskItem(Uri.UnescapeDataString(relativeUri.ToString())));
}
catch {
return false;
}
}
RelativePaths = result.ToArray();
foreach (var i in RelativePaths)
{
Log.LogMessage(MessageImportance.Low, "RelativePaths: " + i.ToString());
}
return true;
]]>
</Code>
</Task>
</UsingTask>
<UsingTask TaskName="CleanAddIn" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
<ParameterGroup>
<ProjectDir ParameterType="System.String" Required="true"/>
<AssemblyName ParameterType="System.String" Required="true"/>
<PackageType ParameterType="System.String" Required="true"/>
<!--<ArcGISFolder ParameterType="System.String" Output="true" /> -->
<CleanInfo ParameterType="System.String" Output="true"/>
</ParameterGroup>
<Task>
<Using Namespace="System"/>
<Using Namespace="System.IO"/>
<Using Namespace="System.Xml.Linq"/>
<Using Namespace="System.Linq"/>
<Code Type="Fragment" Language="cs">
<![CDATA[
Success = false;
string ConfigNotFound = "{0} was not found. File must be present in the root of the project and its build action set to AddInContent.";

//Create the name of the Config File and extension
string extension = "";
string config = "";

if (PackageType.ToLower() == "plugin")
{
config = "Config.xml";
extension = ".esriPlugin";
}
else if (PackageType.ToLower() == "configuration")
{
config = "Config.daml";
extension = ".proConfigX";
}
else
{
config = "Config.daml";
bool proSDKProject = File.Exists(Path.Combine(ProjectDir, config));
if (!proSDKProject) //This might be a class library that uses the Pro references only
return true;
extension = ".esriAddinX";
}

var addInXML = Path.Combine(ProjectDir, config);
if (!File.Exists(addInXML))
{
Log.LogError(ConfigNotFound, config);
return false;
}

//Get the add-in id
XDocument xdoc = XDocument.Load(addInXML);
XNamespace DefaultNS = "http://schemas.esri.com/DADF/Registry";
if (PackageType.ToLower() == "plugin")
{
Log.LogMessage("process plugin");
var addInID = xdoc.Root.Element(DefaultNS + "AddInID");
CleanInfo = addInID.Value;//let it error if it's missing
}
else if (PackageType.ToLower() == "addin")
{
Log.LogMessage("process addin");
var addinInfo = xdoc.Root.Element(DefaultNS + "AddInInfo");
CleanInfo = addinInfo.Attribute("id").Value;//let it error if it's missing
}
else
{
Log.LogMessage("process configuration");
CleanInfo = AssemblyName + extension;
}
Success = true;
return Success;
]]>
</Code>
</Task>
</UsingTask>
<!-- Define additional BuildAction option -->
<!-- Set up default zip properties -->
<PropertyGroup>
<PackageType Condition="'$(PackageType)' == ''">Addin</PackageType>
</PropertyGroup>
<PropertyGroup>
<ArcGISFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\ESRI\ArcGISPro', 'InstallDir', null, RegistryView.Registry64))</ArcGISFolder>
<ArcGISFolder Condition="'$(ArcGISFolder)' == ''">$(registry:HKEY_CURRENT_USER\SOFTWARE\ESRI\ArcGISPro@InstallDir)</ArcGISFolder>
</PropertyGroup>
<Target Name="ArcGISInstallOutput" AfterTargets="Build">
<Message Text="IntermediateOutputPath Name: $(IntermediateOutputPath)..." Importance="High"/>
<Message Text="CleanFile Name: $(CleanFile)..." Importance="High"/>
<Message Text="ProjectDir Name: $(ProjectDir)..." Importance="High"/>
<Message Text="AssemblyName Name: $(AssemblyName)..." Importance="High"/>
<Message Text="TargetFileName Name: $(TargetFileName)..." Importance="High"/>
<Message Text="RootNamespace: $(RootNamespace)..." Importance="High"/>
<Message Text="TargetFolder Name: $(OutDir)..." Importance="High"/>
<Message Text="PackageType Name: $(PackageType)..." Importance="High"/>
<Message Text="Install dir: $(ArcGISFolder)" Importance="High"/>
<!-- Get a list of project outputs from the cache file and FileWritesXXX item,
excluding those in intermediate output directory -->
<!-- Note clean file may miss listing CopyLocal reference -->
<ReadLinesFromFile File="$(IntermediateOutputPath)$(CleanFile)">
<Output TaskParameter="Lines" ItemName="CacheOutputFiles" />
</ReadLinesFromFile>
<FindUnderPath Files="@(CacheOutputFiles)" Path="$(OutDir)">
<Output TaskParameter="InPath" ItemName="PackageOutputFiles" />
</FindUnderPath>
<FindUnderPath Files="@(FileWrites->'%(FullPath)')" Path="$(OutDir)">
<Output TaskParameter="InPath" ItemName="PackageOutputFiles" />
</FindUnderPath>
<FindUnderPath Files="@(FileWritesShareable->'%(FullPath)')" Path="$(OutDir)">
<Output TaskParameter="InPath" ItemName="PackageOutputFiles" />
</FindUnderPath>
<RemoveDuplicates Inputs="@(PackageOutputFiles)">
<Output TaskParameter="Filtered" ItemName="FilteredPackageOutputFiles" />
</RemoveDuplicates>
<ConvertToRelativePath Paths="@(FilteredPackageOutputFiles)" RelativeTo="$(TargetDir)">
<Output TaskParameter="RelativePaths" ItemName="ConfigBinaries" />
</ConvertToRelativePath>
<Message Text="ConvertToRelativePath Task, TargetDir: $(TargetDir) " Importance="High"/>
</Target>
<Target Name="PackageArcGISContents" AfterTargets="ArcGISInstallOutput">
<Message Text="Running PackageArcGISContents..." Importance="High"/>
<RemoveDir Condition="Exists('$(ZipIntermediatePath)')" Directories="$(ZipIntermediatePath)" />
<Message Text="ZipIntermediatePath: $(ZipIntermediatePath)Install..." Importance="High"/>
<!-- Copy project output files, preserving folder structure -->
<Copy SourceFiles="@(ConfigBinaries->'$(OutDir)%(Identity)')" ContinueOnError="true" DestinationFolder="$(IntermediateOutputPath)temp_archive\Install\%(RelativeDir)" />
<!-- Copy items marked with Content as BuildAction, preserving folder structure & handling linked items -->
<!-- Only include items that have CopyToOutputDirectory as Never -->
<Copy SourceFiles="@(Content)" Condition="'%(Content.Link)' == '' And ('%(Content.CopyToOutputDirectory)' == 'Never' Or '%(Content.CopyToOutputDirectory)' == '')" DestinationFolder="$(IntermediateOutputPath)temp_archive\%(RelativeDir)" ContinueOnError="true" />
<Copy SourceFiles="@(Content)" Condition="'%(Content.Link)' != '' And ('%(Content.CopyToOutputDirectory)' == 'Never' Or '%(Content.CopyToOutputDirectory)' == '')" DestinationFiles="$(IntermediateOutputPath)temp_archive\%(Content.Link)" ContinueOnError="true"/>
<!-- Zipping up add-in resources -->
<PackageAddIn ZipIntermediatePath="$(IntermediateOutputPath)temp_archive\"
PackageType="$(PackageType)"
TargetFolder="$(OutDir)"
TargetFileName="$(TargetFileName)"
RootNamespace="$(RootNamespace)">
<Output TaskParameter="PackageOutputPath" PropertyName="PackageFile" />
</PackageAddIn>
<!-- Shell out to RegisterAddIn.exe to install the package -->
<Message Text="Deploying $(PackageType)..." Importance="High"/>
<Message Text="ArcGISFolder Name: $(ArcGISFolder)..." Importance="High"/>
<Message Text="Unable to execute RegisterAddIn.exe. ArcGIS Pro is not installed." Importance="High" Condition="'$(ArcGISFolder)' == ''"/>
<Message Text="Execute RegisterAddIn.exe &quot;$(PackageFile)&quot; /s..." Importance="High" Condition="'$(ArcGISFolder)' != ''"/>
<Exec IgnoreExitCode="true" WorkingDirectory="$(ArcGISFolder)bin" Command="RegisterAddIn.exe &quot;$(PackageFile)&quot; /s" Condition="'$(ArcGISFolder)' != '' AND $(PackageFile) != '' ">
<Output TaskParameter="ExitCode" PropertyName="ESRIRegAddinExitCode" />
</Exec>
<RemoveDir Condition="Exists('$(ZipIntermediatePath)')" Directories="$(ZipIntermediatePath)" />
</Target>
<Target Name="CleanArcGISContents" AfterTargets="Clean">
<CleanAddIn ProjectDir="$(ProjectDir)"
AssemblyName="$(AssemblyName)"
PackageType="$(PackageType)">
<Output TaskParameter="CleanInfo" PropertyName="CleanInfo" />
</CleanAddIn>
<Message Text="Clean $(PackageType)..." Importance="High"/>
<Message Text="Execute RegisterAddIn.exe &quot;$(CleanInfo)&quot; /u..." Importance="High" Condition="'$(ArcGISFolder)' != ''"/>
<Message Text="Unable to execute RegisterAddIn.exe. ArcGIS Pro is not installed." Importance="High" Condition="'$(ArcGISFolder)' == ''"/>
<Exec IgnoreExitCode="true" WorkingDirectory="$(ArcGISFolder)bin" Command="RegisterAddIn.exe &quot;$(CleanInfo)&quot; /u /s" Condition="'$(ArcGISFolder)' != '' AND $(CleanInfo) != ''">
<Output TaskParameter="ExitCode" PropertyName="ESRIRegAddinExitCode" />
</Exec>
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -8,24 +8,31 @@
<RootNameSpace>Speckle.Connectors.ArcGIS</RootNameSpace>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>

<ItemGroup>
<Content Include="Config.daml" />
<Content Include="Images\s2logo_16.png" />
<Content Include="Images\s2logo_32.png" />
<Content Include="DarkImages\s2logo_16.png" />
<Content Include="DarkImages\s2logo_32.png" />
<Content Include="Config.daml"/>
<Content Include="Images\s2logo_16.png"/>
<Content Include="Images\s2logo_32.png"/>
<Content Include="DarkImages\s2logo_16.png"/>
<Content Include="DarkImages\s2logo_32.png"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Esri.ArcGISPro.Extensions30" Version="3.2.0.49743" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="Esri.ArcGISPro.Extensions30" Version="3.2.0.49743"
IncludeAssets="compile"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Converters\ArcGIS\Speckle.Converters.ArcGIS3.DependencyInjection\Speckle.Converters.ArcGIS3.DependencyInjection.csproj" />
<ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
<ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Utils\Speckle.Connectors.Utils.csproj" />
<ProjectReference
Include="..\..\..\Converters\ArcGIS\Speckle.Converters.ArcGIS3.DependencyInjection\Speckle.Converters.ArcGIS3.DependencyInjection.csproj"/>
<ProjectReference
Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj"/>
<ProjectReference
Include="..\..\..\Sdk\Speckle.Connectors.Utils\Speckle.Connectors.Utils.csproj"/>
</ItemGroup>
</Project>

<Import Project="Esri.ArcGISPro.Extensions30.Speckle.targets"/>
</Project>
Loading