Skip to content

Commit 30b79ca

Browse files
BiologyToolsBiologyTools
committed
1.0.5 Fixes issue with uploading files.
1 parent b69d1f3 commit 30b79ca

5 files changed

Lines changed: 17 additions & 8 deletions

File tree

‎ClientOMERO/OMERO.NET.csproj‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Title>OMERO.NET</Title>
99
<PackageReadmeFile>README.md</PackageReadmeFile>
1010
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
11-
<Version>1.0.4</Version>
11+
<Version>1.0.5</Version>
1212
<Authors>Erik Repo</Authors>
1313
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
1414
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
@@ -25,14 +25,23 @@
2525
<Pack>True</Pack>
2626
<PackagePath>\lib\net8.0</PackagePath>
2727
</Content>
28+
<Content Include="google-collect.dll">
29+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
30+
<Pack>True</Pack>
31+
<PackagePath>\lib\net8.0</PackagePath>
32+
</Content>
2833
</ItemGroup>
2934
<ItemGroup>
3035
<IkvmReference Include="omero.5.6.9.jar">
3136
<AssemblyName>omero</AssemblyName>
3237
<AssemblyVersion>5.6.9</AssemblyVersion>
3338
<AssemblyFileVersion>5.6.9</AssemblyFileVersion>
34-
<Compile>batik-script.jar;batik-slideshow.jar;batik-squiggle.jar;batik-squiggle-ext.jar;batik-svgbrowser.jar;batik-svg-dom.jar;batik-svggen.jar;batik-svgpp.jar;batik-svgrasterizer.jar;batik-swing.jar;batik-transcoder.jar;batik-ttf2svg.jar;batik-util.jar;batik-xml.jar;btm.jar;bufr.jar;c3p0.jar;calcite-core.jar;calcite-linq4j.jar;cdm-core.jar;checker-qual.jar;commons-beanutils.jar;commons-codec.jar;commons-collections.jar;commons-collections4.jar;commons-compiler.jar;commons-dbcp2.jar;commons-io.jar;commons-lang.jar;commons-lang3.jar;commons-logging.jar;commons-pool2.jar;dom4j.jar;ehcache.jar;error_prone_annotations.jar;esri-geometry-api.jar;failureaccess.jar;filters.jar;fontbox.jar;formats-api.jar;formats-bsd.jar;formats-gpl.jar;glacier2.jar;google-http-client.jar;google-http-client-xml.jar;guava.jar;hamcrest-core.jar;hazelcast-all.jar;hibernate-commons-annotations.jar;hibernate-core.jar;hibernate-jpa-2.0-api.jar;hibernate-search.jar;hibernate-search-analyzers.jar;httpclient.jar;httpcore.jar;httpmime.jar;httpservices.jar;ice.jar;icegrid.jar;icestorm.jar;ini4j.jar;j2objc-annotations.jar;jackson-annotations.jar;jackson-core.jar;jackson-databind.jar;jackson-dataformat-yaml.jar;jamon.jar;janino.jar;java-getopt.jar;java-image-scaling.jar;javassist.jar;javax.activation.jar;javax.mail.jar;jblosc.jar;jcip-annotations.jar;jcl-over-slf4j.jar;jgoodies-common.jar;jgoodies-forms.jar;jhdf5.jar;jna.jar;joda-time.jar;json.jar;json-path.jar;jta.jar;jul-to-slf4j.jar;junit.jar;jxrlib-all.jar;jython.jar;jzarr.jar;kryo.jar;listenablefuture.jar;logback-classic.jar;logback-core.jar;lucene-analyzers.jar;lucene-core.jar;lucene-highlighter.jar;lucene-memory.jar;lucene-misc.jar;lucene-smartcn.jar;lucene-spatial.jar;lucene-spellchecker.jar;lucene-stempel.jar;memory.jar;metadata-extractor.jar;metakit.jar;metrics-core.jar;metrics-graphite.jar;metrics-jvm.jar;metrics-logback.jar;minio.jar;minlog.jar;native-lib-loader.jar;objenesis.jar;okhttp.jar;okio.jar;ome-codecs.jar;ome-common.jar;ome-jai.jar;ome-mdbtools.jar;ome-poi.jar;omero-blitz.jar;omero-common.jar;omero-gateway.jar;omero-model.jar;omero-renderer.jar;omero-romio.jar;omero-server.jar;ome-xml.jar;OMEZarrReader.jar;pdfbox.jar;perf4j.jar;postgresql.jar;protobuf-java.jar;quartz.jar;re2j.jar;reflectasm.jar;rhino.jar;serializer.jar;sketches-core.jar;slf4j-api.jar;snakeyaml.jar;solr-analysis-extras.jar;solr-commons-csv.jar;solr-core.jar;solr-solrj.jar;specification.jar;spring-aop.jar;spring-beans.jar;spring-context.jar;spring-context-support.jar;spring-core.jar;spring-expression.jar;spring-jdbc.jar;spring-jms.jar;spring-ldap-core.jar;spring-messaging.jar;spring-orm.jar;spring-security-core.jar;spring-security-ldap.jar;spring-tx.jar;sqlite-jdbc.jar;subethasmtp.jar;turbojpeg.jar;udunits.jar;xalan.jar;xercesImpl.jar;xml-apis.jar;xml-apis-ext.jar;xmlgraphics-commons.jar;xmpcore.jar;xpp3.jar;activation.jar;aggdesigner-algorithm.jar;aircompressor.jar;annotations.jar;antlr.jar;aopalliance.jar;avatica-core.jar;avatica-metrics.jar;base.jar;batik-all.jar;batik-anim.jar;batik-awt-util.jar;batik-bridge.jar;batik-codec.jar;batik-constants.jar;batik-css.jar;batik-dom.jar;batik-ext.jar;batik-extension.jar;batik-gui-util.jar;batik-gvt.jar;batik-i18n.jar;batik-parser.jar;batik-rasterizer.jar;batik-rasterizer-ext.jar</Compile>
35-
<Aliases>Omero</Aliases>
39+
<Compile>google-collect-1.0.jar;batik-script.jar;batik-slideshow.jar;batik-squiggle.jar;batik-squiggle-ext.jar;batik-svgbrowser.jar;batik-svg-dom.jar;batik-svggen.jar;batik-svgpp.jar;batik-svgrasterizer.jar;batik-swing.jar;batik-transcoder.jar;batik-ttf2svg.jar;batik-util.jar;batik-xml.jar;btm.jar;bufr.jar;c3p0.jar;calcite-core.jar;calcite-linq4j.jar;cdm-core.jar;checker-qual.jar;commons-beanutils.jar;commons-codec.jar;commons-collections.jar;commons-collections4.jar;commons-compiler.jar;commons-dbcp2.jar;commons-io.jar;commons-lang.jar;commons-lang3.jar;commons-logging.jar;commons-pool2.jar;dom4j.jar;ehcache.jar;error_prone_annotations.jar;esri-geometry-api.jar;failureaccess.jar;filters.jar;fontbox.jar;formats-api.jar;formats-bsd.jar;formats-gpl.jar;glacier2.jar;google-http-client.jar;google-http-client-xml.jar;guava.jar;hamcrest-core.jar;hazelcast-all.jar;hibernate-commons-annotations.jar;hibernate-core.jar;hibernate-jpa-2.0-api.jar;hibernate-search.jar;hibernate-search-analyzers.jar;httpclient.jar;httpcore.jar;httpmime.jar;httpservices.jar;ice.jar;icegrid.jar;icestorm.jar;ini4j.jar;j2objc-annotations.jar;jackson-annotations.jar;jackson-core.jar;jackson-databind.jar;jackson-dataformat-yaml.jar;jamon.jar;janino.jar;java-getopt.jar;java-image-scaling.jar;javassist.jar;javax.activation.jar;javax.mail.jar;jblosc.jar;jcip-annotations.jar;jcl-over-slf4j.jar;jgoodies-common.jar;jgoodies-forms.jar;jhdf5.jar;jna.jar;joda-time.jar;json.jar;json-path.jar;jta.jar;jul-to-slf4j.jar;junit.jar;jxrlib-all.jar;jython.jar;jzarr.jar;kryo.jar;listenablefuture.jar;logback-classic.jar;logback-core.jar;lucene-analyzers.jar;lucene-core.jar;lucene-highlighter.jar;lucene-memory.jar;lucene-misc.jar;lucene-smartcn.jar;lucene-spatial.jar;lucene-spellchecker.jar;lucene-stempel.jar;memory.jar;metadata-extractor.jar;metakit.jar;metrics-core.jar;metrics-graphite.jar;metrics-jvm.jar;metrics-logback.jar;minio.jar;minlog.jar;native-lib-loader.jar;objenesis.jar;okhttp.jar;okio.jar;ome-codecs.jar;ome-common.jar;ome-jai.jar;ome-mdbtools.jar;ome-poi.jar;omero-blitz.jar;omero-common.jar;omero-gateway.jar;omero-model.jar;omero-renderer.jar;omero-romio.jar;omero-server.jar;ome-xml.jar;OMEZarrReader.jar;pdfbox.jar;perf4j.jar;postgresql.jar;protobuf-java.jar;quartz.jar;re2j.jar;reflectasm.jar;rhino.jar;serializer.jar;sketches-core.jar;slf4j-api.jar;snakeyaml.jar;solr-analysis-extras.jar;solr-commons-csv.jar;solr-core.jar;solr-solrj.jar;specification.jar;spring-aop.jar;spring-beans.jar;spring-context.jar;spring-context-support.jar;spring-core.jar;spring-expression.jar;spring-jdbc.jar;spring-jms.jar;spring-ldap-core.jar;spring-messaging.jar;spring-orm.jar;spring-security-core.jar;spring-security-ldap.jar;spring-tx.jar;sqlite-jdbc.jar;subethasmtp.jar;turbojpeg.jar;udunits.jar;xalan.jar;xercesImpl.jar;xml-apis.jar;xml-apis-ext.jar;xmlgraphics-commons.jar;xmpcore.jar;xpp3.jar;activation.jar;aggdesigner-algorithm.jar;aircompressor.jar;annotations.jar;antlr.jar;aopalliance.jar;avatica-core.jar;avatica-metrics.jar;base.jar;batik-all.jar;batik-anim.jar;batik-awt-util.jar;batik-bridge.jar;batik-codec.jar;batik-constants.jar;batik-css.jar;batik-dom.jar;batik-ext.jar;batik-extension.jar;batik-gui-util.jar;batik-gvt.jar;batik-i18n.jar;batik-parser.jar;batik-rasterizer.jar;batik-rasterizer-ext.jar</Compile>
40+
</IkvmReference>
41+
<IkvmReference Include="google-collect-1.0.jar">
42+
<AssemblyName>google-collect</AssemblyName>
43+
<AssemblyVersion>1.0.0</AssemblyVersion>
44+
<AssemblyFileVersion>1.0.0</AssemblyFileVersion>
3645
</IkvmReference>
3746
</ItemGroup>
3847

‎ClientOMERO/google-collect-1.0.jar‎

564 KB
Binary file not shown.

‎ClientOMERO/google-collect.dll‎

599 KB
Binary file not shown.

‎ClientOMERO/guava.jar‎

118 KB
Binary file not shown.

‎OMERO.NET.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.11.35222.181
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csproj", "{A1B09747-5A49-41F2-B119-BC95344AC21E}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OMERO.NET", "..\..\OMERO\OMERO\OMERO.NET.csproj", "{159EF0AD-7038-48EF-B9A7-E7BB8AF73ED9}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OMERO.NET", "ClientOMERO\OMERO.NET.csproj", "{D17DA578-6F85-4420-9037-D6EBD9D8AE15}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,10 +17,10 @@ Global
1717
{A1B09747-5A49-41F2-B119-BC95344AC21E}.Debug|Any CPU.Build.0 = Debug|Any CPU
1818
{A1B09747-5A49-41F2-B119-BC95344AC21E}.Release|Any CPU.ActiveCfg = Release|Any CPU
1919
{A1B09747-5A49-41F2-B119-BC95344AC21E}.Release|Any CPU.Build.0 = Release|Any CPU
20-
{159EF0AD-7038-48EF-B9A7-E7BB8AF73ED9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{159EF0AD-7038-48EF-B9A7-E7BB8AF73ED9}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{159EF0AD-7038-48EF-B9A7-E7BB8AF73ED9}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{159EF0AD-7038-48EF-B9A7-E7BB8AF73ED9}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{D17DA578-6F85-4420-9037-D6EBD9D8AE15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{D17DA578-6F85-4420-9037-D6EBD9D8AE15}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{D17DA578-6F85-4420-9037-D6EBD9D8AE15}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{D17DA578-6F85-4420-9037-D6EBD9D8AE15}.Release|Any CPU.Build.0 = Release|Any CPU
2424
EndGlobalSection
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)