diff --git a/Directory.Build.props b/Directory.Build.props index c55e1ef..d0da2b9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -31,6 +31,6 @@ - + diff --git a/src/JD.MSBuild.Containers.Tasks/JD.MSBuild.Containers.Tasks.csproj b/src/JD.MSBuild.Containers.Tasks/JD.MSBuild.Containers.Tasks.csproj index a1aa239..a03c975 100644 --- a/src/JD.MSBuild.Containers.Tasks/JD.MSBuild.Containers.Tasks.csproj +++ b/src/JD.MSBuild.Containers.Tasks/JD.MSBuild.Containers.Tasks.csproj @@ -15,24 +15,24 @@ - + runtime all - + runtime all - + runtime all - + - + diff --git a/src/JD.MSBuild.Containers.Tasks/packages.lock.json b/src/JD.MSBuild.Containers.Tasks/packages.lock.json index 605e3ed..a477f71 100644 --- a/src/JD.MSBuild.Containers.Tasks/packages.lock.json +++ b/src/JD.MSBuild.Containers.Tasks/packages.lock.json @@ -4,85 +4,63 @@ "net10.0": { "Microsoft.Build.Framework": { "type": "Direct", - "requested": "[18.9.6, )", - "resolved": "18.9.6", - "contentHash": "P5y8IAhu6UyN6FtzfN4sCNZEQGyV6S4kSTBYldtzB9bzvgdCBBKjsS6epH5aJVFM0q1yJqa8RaTzr1iEJBwIMA==", + "requested": "[18.10.1, )", + "resolved": "18.10.1", + "contentHash": "nL8dvvg9V/6PJQ92iQheiGnpkgS/VTBV2py8XM0pzxRYc8byHY83IuriHa3YXkLf3KMWnKlkdoTTt0c5irOXZQ==", "dependencies": { - "Microsoft.NET.StringTools": "18.9.6" + "Microsoft.NET.StringTools": "[18.10.1]" } }, "Microsoft.Build.Utilities.Core": { "type": "Direct", - "requested": "[18.9.6, )", - "resolved": "18.9.6", - "contentHash": "BkU2irGHBdkULHzLmEObQCjOz7x+3unHkcmGa+BlTXyEFyj4wupcSAG3E0SlzpeF9s3ViSLbhjNDMHwMxC/Ugg==", + "requested": "[18.10.1, )", + "resolved": "18.10.1", + "contentHash": "MXBaRIyOuy55jMsv8YMUEsyM9itWaPnfB56qe2St9fYF1YavL4MnCZovKP4Q1AiR1+RgMyLql3OfNbghDM3PbA==", "dependencies": { - "Microsoft.Build.Framework": "18.9.6", - "System.Configuration.ConfigurationManager": "10.0.8", - "System.Diagnostics.EventLog": "10.0.8", - "System.Security.Cryptography.ProtectedData": "10.0.8" + "Microsoft.Build.Framework": "[18.10.1]" } }, "Microsoft.NET.StringTools": { "type": "Direct", - "requested": "[18.9.6, )", - "resolved": "18.9.6", - "contentHash": "CNZfh4P65tHm1Wh/uuIbYfvHlPnb0dJ9SCaIZbXRzOMn+8JEorSqSdXdGRsrDbKBDJfNG6nmgleYhnfL2pd1oQ==" + "requested": "[18.10.1, )", + "resolved": "18.10.1", + "contentHash": "/fIQMMIRzamkho+Teh7K0G8YaH85s2meFwxjFleBJ1DMnX2RHnRjg4xyWoFbmj260Vl4W2b1r7CuvbMAC+W+nQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[10.0.400, )", - "resolved": "10.0.400", - "contentHash": "N1Ut0+EmMb2Tma9spHxAgpCspkln4gst1RWYc1PYPn8LA4KJWDSiggKpE183lfR98TNG2C+XnJ71zSYtuCSsqA==", + "requested": "[10.0.401, )", + "resolved": "10.0.401", + "contentHash": "LGmlwgP1Cx37JEWzyjS0o1/+xs/s/e3E2TBSuogI5ePA/9L0pfIfeYX0k5in7Bfcw8Nn2y2sG9jXxydTjiR2Fg==", "dependencies": { - "Microsoft.Build.Tasks.Git": "10.0.400", - "Microsoft.SourceLink.Common": "10.0.400", - "System.IO.Hashing": "10.0.11" + "Microsoft.Build.Tasks.Git": "10.0.401", + "Microsoft.SourceLink.Common": "10.0.401", + "System.IO.Hashing": "10.0.12" } }, "System.IO.Hashing": { "type": "Direct", - "requested": "[10.0.11, )", - "resolved": "10.0.11", - "contentHash": "OzKDcIRkeNJeC8qAsbn8yJXnfTLP1dtkWILe+T56Gf/z+IkAASi7sMqLqJQat08j5z/mRN5xVtoAwbkMNMoBUQ==" + "requested": "[10.0.12, )", + "resolved": "10.0.12", + "contentHash": "jDix4bBMYnpZdSPcnY+KDV6ik3SRMzpMKby/bZl/XUwIiflwRNAFZ0oOl61R/pSaveIJ8t1gs2BUlrGsPs/bcg==" }, "System.Text.Json": { "type": "Direct", - "requested": "[10.0.11, )", - "resolved": "10.0.11", - "contentHash": "X2rXQy7g8KEUvWVbAz6vOk6byI1eMgmzFeXbKxq4BfZCfFy5S91K+K+hd4ZBlSp0wL1Y8FyGRXs6+hvABTjwQw==" + "requested": "[10.0.12, )", + "resolved": "10.0.12", + "contentHash": "AHlVpUiY96eC6Oar1Gf0YbafU7E2NUU9D80O2Xk5v7ryL3kpSsbI0EusJBE8kQfwPuDdUDoKUItArzXQHxomCg==" }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "10.0.400", - "contentHash": "uXJ/eBDqAo9HlyPjvvvynjHb59KXQWG9txpBzyI1drO6MV3Lhndt2yhxuMKvIga4kND2UKc3xCNXlXBhWU8Hlg==", + "resolved": "10.0.401", + "contentHash": "ZYctNuT10V9IYyCFydy63DXx0ggZQuynuzQOdLvW62dPgzjIz7f0ISEP75RGiq1jFQh8p6TmGSqxeQZQ87LCig==", "dependencies": { - "System.IO.Hashing": "10.0.11" + "System.IO.Hashing": "10.0.12" } }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "10.0.400", - "contentHash": "Knli3Y2k/rdBqUlQ8TP+Sbd0J0jV/0kvgLsxieowoVayioZ0JGfqb9go+/dQJqtU53i6IpZzRxAPxbBT5UJBNg==" - }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "10.0.8", - "contentHash": "QG+HHwJjLyUiRuA9axr5pDqHAxboo7FXCTRakxMABE9CUAUij/tsd/MsgQPJUEppkf+YBLT+F/P/wKIVCAIcNg==", - "dependencies": { - "System.Diagnostics.EventLog": "10.0.8", - "System.Security.Cryptography.ProtectedData": "10.0.8" - } - }, - "System.Diagnostics.EventLog": { - "type": "Transitive", - "resolved": "10.0.8", - "contentHash": "+Ro7WgIom+BDNH+YhTuZKL6QJ0ctfOpTyfUG/h3aU5KwXt3OaNf0wYWrTvoBUj+34Dy5V8dN9yCco1hAJQ4txw==" - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "10.0.8", - "contentHash": "/ldVgSfImIBp6fLWS7sLH0BnmtFj0ZwGlZo4Xx2q0K3ZhJNDbW45kj2f6zPoC+L+BTINuHdMzTsopuwmkbgcNA==" + "resolved": "10.0.401", + "contentHash": "u3rLxIwi/9MqDFaWGE/QQgLR1NBEzLOW2lv5+9OrZPDBYIAmFdYSWCWrR1ufpXWOqFn+x02TgKropl/oDuHmgA==" } } } diff --git a/src/JD.MSBuild.Containers/packages.lock.json b/src/JD.MSBuild.Containers/packages.lock.json index 8ccd331..2516d30 100644 --- a/src/JD.MSBuild.Containers/packages.lock.json +++ b/src/JD.MSBuild.Containers/packages.lock.json @@ -4,32 +4,32 @@ "net9.0": { "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[10.0.400, )", - "resolved": "10.0.400", - "contentHash": "N1Ut0+EmMb2Tma9spHxAgpCspkln4gst1RWYc1PYPn8LA4KJWDSiggKpE183lfR98TNG2C+XnJ71zSYtuCSsqA==", + "requested": "[10.0.401, )", + "resolved": "10.0.401", + "contentHash": "LGmlwgP1Cx37JEWzyjS0o1/+xs/s/e3E2TBSuogI5ePA/9L0pfIfeYX0k5in7Bfcw8Nn2y2sG9jXxydTjiR2Fg==", "dependencies": { - "Microsoft.Build.Tasks.Git": "10.0.400", - "Microsoft.SourceLink.Common": "10.0.400", - "System.IO.Hashing": "10.0.11" + "Microsoft.Build.Tasks.Git": "10.0.401", + "Microsoft.SourceLink.Common": "10.0.401", + "System.IO.Hashing": "10.0.12" } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "10.0.400", - "contentHash": "uXJ/eBDqAo9HlyPjvvvynjHb59KXQWG9txpBzyI1drO6MV3Lhndt2yhxuMKvIga4kND2UKc3xCNXlXBhWU8Hlg==", + "resolved": "10.0.401", + "contentHash": "ZYctNuT10V9IYyCFydy63DXx0ggZQuynuzQOdLvW62dPgzjIz7f0ISEP75RGiq1jFQh8p6TmGSqxeQZQ87LCig==", "dependencies": { - "System.IO.Hashing": "10.0.11" + "System.IO.Hashing": "10.0.12" } }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "10.0.400", - "contentHash": "Knli3Y2k/rdBqUlQ8TP+Sbd0J0jV/0kvgLsxieowoVayioZ0JGfqb9go+/dQJqtU53i6IpZzRxAPxbBT5UJBNg==" + "resolved": "10.0.401", + "contentHash": "u3rLxIwi/9MqDFaWGE/QQgLR1NBEzLOW2lv5+9OrZPDBYIAmFdYSWCWrR1ufpXWOqFn+x02TgKropl/oDuHmgA==" }, "System.IO.Hashing": { "type": "Transitive", - "resolved": "10.0.11", - "contentHash": "OzKDcIRkeNJeC8qAsbn8yJXnfTLP1dtkWILe+T56Gf/z+IkAASi7sMqLqJQat08j5z/mRN5xVtoAwbkMNMoBUQ==" + "resolved": "10.0.12", + "contentHash": "jDix4bBMYnpZdSPcnY+KDV6ik3SRMzpMKby/bZl/XUwIiflwRNAFZ0oOl61R/pSaveIJ8t1gs2BUlrGsPs/bcg==" } } } diff --git a/tests/JD.MSBuild.Containers.Tests/JD.MSBuild.Containers.Tests.csproj b/tests/JD.MSBuild.Containers.Tests/JD.MSBuild.Containers.Tests.csproj index eb40cd2..a479ad1 100644 --- a/tests/JD.MSBuild.Containers.Tests/JD.MSBuild.Containers.Tests.csproj +++ b/tests/JD.MSBuild.Containers.Tests/JD.MSBuild.Containers.Tests.csproj @@ -17,20 +17,20 @@ all - - + + runtime all - + runtime all - + runtime all - + diff --git a/tests/JD.MSBuild.Containers.Tests/packages.lock.json b/tests/JD.MSBuild.Containers.Tests/packages.lock.json index f6dc5c5..3de9d09 100644 --- a/tests/JD.MSBuild.Containers.Tests/packages.lock.json +++ b/tests/JD.MSBuild.Containers.Tests/packages.lock.json @@ -10,11 +10,11 @@ }, "Microsoft.Build.Framework": { "type": "Direct", - "requested": "[18.9.6, )", - "resolved": "18.9.6", - "contentHash": "P5y8IAhu6UyN6FtzfN4sCNZEQGyV6S4kSTBYldtzB9bzvgdCBBKjsS6epH5aJVFM0q1yJqa8RaTzr1iEJBwIMA==", + "requested": "[18.10.1, )", + "resolved": "18.10.1", + "contentHash": "nL8dvvg9V/6PJQ92iQheiGnpkgS/VTBV2py8XM0pzxRYc8byHY83IuriHa3YXkLf3KMWnKlkdoTTt0c5irOXZQ==", "dependencies": { - "Microsoft.NET.StringTools": "18.9.6" + "Microsoft.NET.StringTools": "[18.10.1]" } }, "Microsoft.Build.Locator": { @@ -25,50 +25,47 @@ }, "Microsoft.Build.Utilities.Core": { "type": "Direct", - "requested": "[18.9.6, )", - "resolved": "18.9.6", - "contentHash": "BkU2irGHBdkULHzLmEObQCjOz7x+3unHkcmGa+BlTXyEFyj4wupcSAG3E0SlzpeF9s3ViSLbhjNDMHwMxC/Ugg==", + "requested": "[18.10.1, )", + "resolved": "18.10.1", + "contentHash": "MXBaRIyOuy55jMsv8YMUEsyM9itWaPnfB56qe2St9fYF1YavL4MnCZovKP4Q1AiR1+RgMyLql3OfNbghDM3PbA==", "dependencies": { - "Microsoft.Build.Framework": "18.9.6", - "System.Configuration.ConfigurationManager": "10.0.8", - "System.Diagnostics.EventLog": "10.0.8", - "System.Security.Cryptography.ProtectedData": "10.0.8" + "Microsoft.Build.Framework": "[18.10.1]" } }, "Microsoft.NET.StringTools": { "type": "Direct", - "requested": "[18.9.6, )", - "resolved": "18.9.6", - "contentHash": "CNZfh4P65tHm1Wh/uuIbYfvHlPnb0dJ9SCaIZbXRzOMn+8JEorSqSdXdGRsrDbKBDJfNG6nmgleYhnfL2pd1oQ==" + "requested": "[18.10.1, )", + "resolved": "18.10.1", + "contentHash": "/fIQMMIRzamkho+Teh7K0G8YaH85s2meFwxjFleBJ1DMnX2RHnRjg4xyWoFbmj260Vl4W2b1r7CuvbMAC+W+nQ==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[18.9.0, )", - "resolved": "18.9.0", - "contentHash": "xIzVXa/VpKXqDWzyC/5Hw8JbFY5u9k3Jc53CpcjBiOXvkQGio484LD9FNwOiGUSMDcYL3Rcw9sNgGi5WrswlPQ==", + "requested": "[18.10.0, )", + "resolved": "18.10.0", + "contentHash": "0CZZ688UBvpQFB9HKo7wrNJNVe+AOM4UtipgwpER3TTM+d2DDM6QyKkIJZTR3mpbn9/zFbZEtAgVIz4SPTjQZQ==", "dependencies": { - "Microsoft.CodeCoverage": "18.9.0", - "Microsoft.TestPlatform.TestHost": "18.9.0" + "Microsoft.CodeCoverage": "18.10.0", + "Microsoft.TestPlatform.TestHost": "18.10.0" } }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[10.0.400, )", - "resolved": "10.0.400", - "contentHash": "N1Ut0+EmMb2Tma9spHxAgpCspkln4gst1RWYc1PYPn8LA4KJWDSiggKpE183lfR98TNG2C+XnJ71zSYtuCSsqA==", + "requested": "[10.0.401, )", + "resolved": "10.0.401", + "contentHash": "LGmlwgP1Cx37JEWzyjS0o1/+xs/s/e3E2TBSuogI5ePA/9L0pfIfeYX0k5in7Bfcw8Nn2y2sG9jXxydTjiR2Fg==", "dependencies": { - "Microsoft.Build.Tasks.Git": "10.0.400", - "Microsoft.SourceLink.Common": "10.0.400", - "System.IO.Hashing": "10.0.11" + "Microsoft.Build.Tasks.Git": "10.0.401", + "Microsoft.SourceLink.Common": "10.0.401", + "System.IO.Hashing": "10.0.12" } }, "TinyBDD.Xunit": { "type": "Direct", - "requested": "[0.19.35, )", - "resolved": "0.19.35", - "contentHash": "n5qVkmdcgq9zQuaM9Bhxg0uxG7S2FBVomPXIxI44yYC/2h5UjqUbo5xEo68kfMQo85jBVMKSknDV1whpv3HVSQ==", + "requested": "[0.19.39, )", + "resolved": "0.19.39", + "contentHash": "ttDvq+fyCcojHprOS6ktLspCj80OSLQdH9XGjJ7iprt1hl84Ps4K82oRmHAlO4ogLi/2ZxnwvSlQ95607p398Q==", "dependencies": { - "TinyBDD": "0.19.35", + "TinyBDD": "0.19.39", "xunit.abstractions": "2.0.3", "xunit.extensibility.core": "2.9.3" } @@ -102,16 +99,16 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "10.0.400", - "contentHash": "uXJ/eBDqAo9HlyPjvvvynjHb59KXQWG9txpBzyI1drO6MV3Lhndt2yhxuMKvIga4kND2UKc3xCNXlXBhWU8Hlg==", + "resolved": "10.0.401", + "contentHash": "ZYctNuT10V9IYyCFydy63DXx0ggZQuynuzQOdLvW62dPgzjIz7f0ISEP75RGiq1jFQh8p6TmGSqxeQZQ87LCig==", "dependencies": { - "System.IO.Hashing": "10.0.11" + "System.IO.Hashing": "10.0.12" } }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "18.9.0", - "contentHash": "MtegCIKGuG0r/LCdIjoR1HgzCGIUBhR3aNdbtQpts5vMXQuqBDZ2Jsd2uFKoHFM2XrQV6ZrDf3F5oLi3SLTp8w==" + "resolved": "18.10.0", + "contentHash": "zo1hqV+Nz6FlIwdc+aPfrvGzqfKAPPaZ6OPj1W8C0QQE2xH951AZwTUytL3K7XX8brVBUFd7MhrLDl3CtK3U/A==" }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", @@ -128,50 +125,31 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "10.0.400", - "contentHash": "Knli3Y2k/rdBqUlQ8TP+Sbd0J0jV/0kvgLsxieowoVayioZ0JGfqb9go+/dQJqtU53i6IpZzRxAPxbBT5UJBNg==" + "resolved": "10.0.401", + "contentHash": "u3rLxIwi/9MqDFaWGE/QQgLR1NBEzLOW2lv5+9OrZPDBYIAmFdYSWCWrR1ufpXWOqFn+x02TgKropl/oDuHmgA==" }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "18.9.0", - "contentHash": "Fz/qXC52VXXopzHj7v2reCKcCqSxkTDCkEDfkNAH0vni/7qK/KLMiEYtRmnUanxO2F2g2zZZ60qCpxF0AF7URA==" + "resolved": "18.10.0", + "contentHash": "aXA7DDbnt6MYu3eLBEDksNdl09QxJ/PpMzrFcSxqEOk3RvRGJzhKI5mezVCEOcvveRhjfw/mvn6xVXC/rTaOog==" }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "18.9.0", - "contentHash": "Oq+Pma/J86aZL72t71bcESvDszDsTjUfl6PIsuDdPoKTHZfNMhKamCfLD5fKx51W/u0KozXtJo2/3fnt0sgPxg==", + "resolved": "18.10.0", + "contentHash": "Spu6C7bgz1PmWN+Y7wS0PfGCw9Kwv5RvJbCwyQaEWjcwpMire+qYMrcZ7qk8agjy6nd0sdHLc3ugCSrGuSbZdw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "18.9.0" + "Microsoft.TestPlatform.ObjectModel": "18.10.0" } }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "10.0.8", - "contentHash": "QG+HHwJjLyUiRuA9axr5pDqHAxboo7FXCTRakxMABE9CUAUij/tsd/MsgQPJUEppkf+YBLT+F/P/wKIVCAIcNg==", - "dependencies": { - "System.Diagnostics.EventLog": "10.0.8", - "System.Security.Cryptography.ProtectedData": "10.0.8" - } - }, - "System.Diagnostics.EventLog": { - "type": "Transitive", - "resolved": "10.0.8", - "contentHash": "+Ro7WgIom+BDNH+YhTuZKL6QJ0ctfOpTyfUG/h3aU5KwXt3OaNf0wYWrTvoBUj+34Dy5V8dN9yCco1hAJQ4txw==" - }, "System.IO.Hashing": { "type": "Transitive", - "resolved": "10.0.11", - "contentHash": "OzKDcIRkeNJeC8qAsbn8yJXnfTLP1dtkWILe+T56Gf/z+IkAASi7sMqLqJQat08j5z/mRN5xVtoAwbkMNMoBUQ==" - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "10.0.8", - "contentHash": "/ldVgSfImIBp6fLWS7sLH0BnmtFj0ZwGlZo4Xx2q0K3ZhJNDbW45kj2f6zPoC+L+BTINuHdMzTsopuwmkbgcNA==" + "resolved": "10.0.12", + "contentHash": "jDix4bBMYnpZdSPcnY+KDV6ik3SRMzpMKby/bZl/XUwIiflwRNAFZ0oOl61R/pSaveIJ8t1gs2BUlrGsPs/bcg==" }, "TinyBDD": { "type": "Transitive", - "resolved": "0.19.35", - "contentHash": "aMeHGy5sUoKX1+/q8ZbXWC14depupmZjJKPG9eeHoMW0XIS7mfG2g7JWHBK9Sll9P2pSodZ2+a3vaPxQkAkzug==", + "resolved": "0.19.39", + "contentHash": "Jx/W1eazJGDVpa+TWiF0eY/cjiNriuXINaWuw10zzr9J+vwa64jZcDi3J099qrSKqmu+4APSrVT8rrILJwUOuA==", "dependencies": { "Microsoft.Extensions.DependencyInjection": "10.0.8", "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8" @@ -225,7 +203,7 @@ "jd.msbuild.containers.tasks": { "type": "Project", "dependencies": { - "System.IO.Hashing": "[10.0.11, )" + "System.IO.Hashing": "[10.0.12, )" } } }