all tests run individually

lib/WebGUI/AssetPackage.pm

@@ -163,7 +163,6 @@ sub importAssetData {
     WebGUI::Asset->loadModule( $class );
 
     my %properties = %{ $data->{properties} };
-    delete $properties{tagId};
     if ($options->{inheritPermissions}) {
         delete $properties{ownerUserId};
         delete $properties{groupIdView};
@@ -265,7 +264,6 @@ sub importPackage {
         if $storage->getErrorCount;
     my $package         = undef;            # The asset package
     my $log           = $self->session->log;
-    my $tag             = WebGUI::VersionTag->getWorking( $self->session );
 
     # The debug output for long requests would be too long, and we'd have to
     # keep it all in memory.
@@ -294,6 +292,11 @@ sub importPackage {
             $decompressed->untar($storageId.".storage", $assetStorage);
         }
 
+        if ( $options->{tagId} ) {
+            $data->{properties}{tagId}  = $options->{tagId};
+            $data->{properties}{status} = "pending";
+        }
+
         my $parentId = $data->{properties}->{parentId};
         my $asset;
         while ($asset = pop(@stack)) {

lib/WebGUI/Upgrade/File/wgpkg.pm

@@ -39,6 +39,7 @@ sub run {
     (undef, undef, my $shortname) = File::Spec->splitpath($self->file);
     $shortname =~ s/\.[^.]*$//;
     $versionTag->set({name => "Upgrade to @{[$self->version]} - $shortname"});
+    $versionTag->setWorking;
 
     my $package = $self->import_package($session, $self->file);
     if (! $self->quiet) {
@@ -56,6 +57,8 @@ sub import_package {
     my $class = shift;
     my ($session, $file) = @_;
 
+    my $versionTag  = WebGUI::VersionTag->getWorking( $session, "nocreate" );
+
     # Make a storage location for the package
     my $storage = WebGUI::Storage->createTemp( $session );
     $storage->addFileFromFilesystem( $file );
@@ -67,6 +70,7 @@ sub import_package {
             overwriteLatest    => 1,
             clearPackageFlag   => 1,
             setDefaultTemplate => 1,
+            tagId              => ( $versionTag ? $versionTag->getId : undef ),
         } );
     }
     catch {