Skip to content

Commit 5006c82

Browse files
PerkseyPerksey
authored
Minor fixes to 2.X branch for 3.0
1 parent c534b40 commit 5006c82

File tree

3 files changed

+101
-96
lines changed

3 files changed

+101
-96
lines changed

‎build/nuke/Build.Support.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@ Dictionary<string, object> ProcessedMsbuildProperties
109109
return (object) x.Substring(idx + 1, x.Length - idx - 1);
110110
}
111111
);
112+
113+
if (!ProcessedMsbuildPropertiesValue.ContainsKey("SilkNukeBuild"))
114+
{
115+
ProcessedMsbuildPropertiesValue["SilkNukeBuild"] = "true";
116+
}
112117
}
113118

114119
return ProcessedMsbuildPropertiesValue;

‎documentation/proposals/Proposal - Generic Math.md‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ For each vector struct, the following requirements **must** fulfill the followin
6565
- Define `VectorND<T> * MatrixNXM` operators where N is the same for both Vector and Matrix, but M is any number
6666
- These operators should function like Transform, but without needed assumptions
6767
- Define TransformNormal static methods which take a Matrix of higher dimensionality assuming 0 in for all missing components (Vector 2 can use `Matrix2Xn`, `Matrix3Xn`, and `Matrix4Xn`) and return a vector containing the output (type should match the outer type e.g. `Vector2D.Transform(Matrix4X4)` returns `Vector2D`)
68-
- For types implementing IBinaryNumber<T>
68+
- For types implementing `IBinaryNumber<T>`
6969
- `BitwiseAnd`, `BitwiseOr`, and `BitwiseXor` static methods defined between two vectors which returns a vector which has had these operators applied on a component-wise basis.
7070
- `BitwiseAnd`, `BitwiseOr`, and `BitwiseXor` static methods operators defined between a vectors and a scalar value that matches the generic type which returns a vector which has had these operators applied on a component-wise basis with the scalar.
7171
- `BitwiseNot` static method defined which negates the bits of the vector components. (BitwiseComplement?)
@@ -81,107 +81,107 @@ For each vector struct, the following requirements **must** fulfill the followin
8181
- Tau
8282
- E
8383
- Define the following static methods for these types which calls the specified function and returns a new vector with the specified multiplicity:
84-
- INumber<>.Sign, (Memberwise)
84+
- `INumber<>.Sign`, (Memberwise)
8585
- Returns `VectorND<int>`, where N matches the dimensionality of the vector
86-
- INumber<>.Max, (Memberwise, Memberwise)
87-
- INumber<>.Max, (Memberwise, Scalar)
88-
- INumber<>.MaxNumber, (Memberwise, Memberwise)
89-
- INumber<>.MaxNumber, (Memberwise, Scalar)
90-
- INumber<>.Min, (Memberwise, Memberwise)
91-
- INumber<>.Min, (Memberwise, Scalar)
92-
- INumber<>.MinNumber, (Memberwise, Memberwise)
93-
- INumber<>.MinNumber, (Memberwise, Scalar)
94-
- INumber<>.Clamp, (Memberwise, Memberwise, Memberwise)
95-
- INumber<>.Clamp, (Memberwise, Scalar, Scalar)
96-
- INumber<>.CopySign, (Memberwise, Memberwise)
97-
- INumber<>.CopySign, (Memberwise, Scalar)
98-
- INumberBase<>.Abs, (Memberwise)
99-
- INumberBase<>.MaxMagnitude, (Memberwise, Memberwise)
100-
- INumberBase<>.MaxMagnitudeNumber, (Memberwise, Memberwise)
101-
- INumberBase<>.MinMagnitude, (Memberwise, Memberwise)
102-
- INumberBase<>.MinMagnitudeNumber, (Memberwise, Memberwise)
103-
- INumberBase<>.MultiplyAddEstimate, (Memberwise, Memberwise, Memberwise)
104-
- INumberBase<>.MultiplyAddEstimate, (Memberwise, Memberwise, Scalar)
105-
- INumberBase<>.MultiplyAddEstimate, (Memberwise, Scalar, Memberwise)
106-
- INumberBase<>.MultiplyAddEstimate, (Memberwise, Scalar, Scalar)
107-
- IBinaryNumber<>.Log2, (Memberwise)
108-
- IBinaryInteger<>.DivRem, (Memberwise)
86+
- `INumber<>.Max`, (Memberwise, Memberwise)
87+
- `INumber<>.Max`, (Memberwise, Scalar)
88+
- `INumber<>.MaxNumber`, (Memberwise, Memberwise)
89+
- `INumber<>.MaxNumber`, (Memberwise, Scalar)
90+
- `INumber<>.Min`, (Memberwise, Memberwise)
91+
- `INumber<>.Min`, (Memberwise, Scalar)
92+
- `INumber<>.MinNumber`, (Memberwise, Memberwise)
93+
- `INumber<>.MinNumber`, (Memberwise, Scalar)
94+
- `INumber<>.Clamp`, (Memberwise, Memberwise, Memberwise)
95+
- `INumber<>.Clamp`, (Memberwise, Scalar, Scalar)
96+
- `INumber<>.CopySign`, (Memberwise, Memberwise)
97+
- `INumber<>.CopySign`, (Memberwise, Scalar)
98+
- `INumberBase<>.Abs`, (Memberwise)
99+
- `INumberBase<>.MaxMagnitude`, (Memberwise, Memberwise)
100+
- `INumberBase<>.MaxMagnitudeNumber`, (Memberwise, Memberwise)
101+
- `INumberBase<>.MinMagnitude`, (Memberwise, Memberwise)
102+
- `INumberBase<>.MinMagnitudeNumber`, (Memberwise, Memberwise)
103+
- `INumberBase<>.MultiplyAddEstimate`, (Memberwise, Memberwise, Memberwise)
104+
- `INumberBase<>.MultiplyAddEstimate`, (Memberwise, Memberwise, Scalar)
105+
- `INumberBase<>.MultiplyAddEstimate`, (Memberwise, Scalar, Memberwise)
106+
- `INumberBase<>.MultiplyAddEstimate`, (Memberwise, Scalar, Scalar)
107+
- `IBinaryNumber<>.Log2`, (Memberwise)
108+
- `IBinaryInteger<>.DivRem`, (Memberwise)
109109
- Returns tuple of 2 Vectors (Vector Quotient, Vector Remainder)
110-
- IBinaryInteger<>.PopCount, (Memberwise)
111-
- IBinaryInteger<>.TrailingZeroCount, (Memberwise)
112-
- IFloatingPoint<>.Ceiling, (Memberwise)
113-
- IFloatingPoint<>.Floor, (Memberwise)
114-
- IFloatingPoint<>.Round, (Memberwise)
115-
- IFloatingPoint<>.Round, (Memberwise, Scalar) *`int digits`
116-
- IFloatingPoint<>.Round, (Memberwise, Scalar) *`MidpointRounding mode`
117-
- IFloatingPoint<>.Round, (Memberwise, Scalar, Scalar) *`int digits, MidpointRounding mode`
118-
- IFloatingPoint<>.Truncate, (Memberwise)
119-
- IFloatingPointIeee754<>.Atan2, (Memberwise, Memberwise)
120-
- IFloatingPointIeee754<>.Atan2Pi, (Memberwise, Memberwise)
121-
- IFloatingPointIeee754<>.Lerp, (Memberwise, Memberwise, Memberwise)
122-
- IFloatingPointIeee754<>.Lerp, (Memberwise, Memberwise, Scalar)
123-
- IFloatingPointIeee754<>.BitDecrement, (Memberwise)
124-
- IFloatingPointIeee754<>.BitIncrement, (Memberwise)
125-
- IFloatingPointIeee754<>.FusedMultiplyAdd, (Memberwise, Memberwise, Memberwise)
126-
- IFloatingPointIeee754<>.FusedMultiplyAdd, (Memberwise, Memberwise, Scalar)
127-
- IFloatingPointIeee754<>.FusedMultiplyAdd, (Memberwise, Scalar, Memberwise)
128-
- IFloatingPointIeee754<>.FusedMultiplyAdd, (Memberwise, Scalar, Scalar)
129-
- IFloatingPointIeee754<>.Ieee754Remainder, (Memberwise, Memberwise)
130-
- IFloatingPointIeee754<>.Ieee754Remainder, (Memberwise, Scalar)
131-
- IFloatingPointIeee754<>.ILogB, (Memberwise)
110+
- `IBinaryInteger<>.PopCount`, (Memberwise)
111+
- `IBinaryInteger<>.TrailingZeroCount`, (Memberwise)
112+
- `IFloatingPoint<>.Ceiling`, (Memberwise)
113+
- `IFloatingPoint<>.Floor`, (Memberwise)
114+
- `IFloatingPoint<>.Round`, (Memberwise)
115+
- `IFloatingPoint<>.Round`, (Memberwise, Scalar) *`int digits`
116+
- `IFloatingPoint<>.Round`, (Memberwise, Scalar) *`MidpointRounding mode`
117+
- `IFloatingPoint<>.Round`, (Memberwise, Scalar, Scalar) *`int digits, MidpointRounding mode`
118+
- `IFloatingPoint<>.Truncate`, (Memberwise)
119+
- `IFloatingPointIeee754<>.Atan2`, (Memberwise, Memberwise)
120+
- `IFloatingPointIeee754<>.Atan2Pi`, (Memberwise, Memberwise)
121+
- `IFloatingPointIeee754<>.Lerp`, (Memberwise, Memberwise, Memberwise)
122+
- `IFloatingPointIeee754<>.Lerp`, (Memberwise, Memberwise, Scalar)
123+
- `IFloatingPointIeee754<>.BitDecrement`, (Memberwise)
124+
- `IFloatingPointIeee754<>.BitIncrement`, (Memberwise)
125+
- `IFloatingPointIeee754<>.FusedMultiplyAdd`, (Memberwise, Memberwise, Memberwise)
126+
- `IFloatingPointIeee754<>.FusedMultiplyAdd`, (Memberwise, Memberwise, Scalar)
127+
- `IFloatingPointIeee754<>.FusedMultiplyAdd`, (Memberwise, Scalar, Memberwise)
128+
- `IFloatingPointIeee754<>.FusedMultiplyAdd`, (Memberwise, Scalar, Scalar)
129+
- `IFloatingPointIeee754<>.Ieee754Remainder`, (Memberwise, Memberwise)
130+
- `IFloatingPointIeee754<>.Ieee754Remainder`, (Memberwise, Scalar)
131+
- `IFloatingPointIeee754<>.ILogB`, (Memberwise)
132132
- Returns `VectorND<int>`, where N matches the dimensionality of the vector
133133
- **INFORMATIVE** This may require multiple methods depending on implementation
134-
- IFloatingPointIeee754<>.ReciprocalEstimate, (Memberwise)
135-
- IFloatingPointIeee754<>.ReciprocalSqrtEstimate, (Memberwise)
136-
- IFloatingPointIeee754<>.ScaleB, (Memberwise, Memberwise)
137-
- IFloatingPointIeee754<>.ScaleB, (Memberwise, Scalar)
138-
- IPowerFunctions<>.Pow, (Memberwise, Memberwise)
139-
- IPowerFunctions<>.Pow, (Memberwise, Scalar)
140-
- IRootFunctions<>.Cbrt, (Memberwise)
141-
- IRootFunctions<>.Sqrt, (Memberwise)
142-
- IRootFunctions<>.RootN, (Memberwise, Memberwise)
143-
- IRootFunctions<>.RootN, (Memberwise, Scalar)
144-
- IRootFunctions<>.Hypot, (Memberwise, Memberwise)
145-
- IRootFunctions<>.Hypot, (Memberwise, Scalar)
146-
- ILogarithmicFunctions<>.Log, (Memberwise)
147-
- ILogarithmicFunctions<>.Log, (Memberwise, Memberwise)
148-
- ILogarithmicFunctions<>.Log, (Memberwise, Scalar)
149-
- ILogarithmicFunctions<>.LogP1, (Memberwise)
150-
- ~~ILogarithmicFunctions<>.Log2, (Memberwise)~~
134+
- `IFloatingPointIeee754<>.ReciprocalEstimate`, (Memberwise)
135+
- `IFloatingPointIeee754<>.ReciprocalSqrtEstimate`, (Memberwise)
136+
- `IFloatingPointIeee754<>.ScaleB`, (Memberwise, Memberwise)
137+
- `IFloatingPointIeee754<>.ScaleB`, (Memberwise, Scalar)
138+
- `IPowerFunctions<>.Pow`, (Memberwise, Memberwise)
139+
- `IPowerFunctions<>.Pow`, (Memberwise, Scalar)
140+
- `IRootFunctions<>.Cbrt`, (Memberwise)
141+
- `IRootFunctions<>.Sqrt`, (Memberwise)
142+
- `IRootFunctions<>.RootN`, (Memberwise, Memberwise)
143+
- `IRootFunctions<>.RootN`, (Memberwise, Scalar)
144+
- `IRootFunctions<>.Hypot`, (Memberwise, Memberwise)
145+
- `IRootFunctions<>.Hypot`, (Memberwise, Scalar)
146+
- `ILogarithmicFunctions<>.Log`, (Memberwise)
147+
- `ILogarithmicFunctions<>.Log`, (Memberwise, Memberwise)
148+
- `ILogarithmicFunctions<>.Log`, (Memberwise, Scalar)
149+
- `ILogarithmicFunctions<>.LogP1`, (Memberwise)
150+
- ~~`ILogarithmicFunctions<>.Log2`, (Memberwise)~~
151151
- Provided via `IBinaryNumber<>`, which is present on all builtin types that implement `ILogarithmicFunctions<>`
152-
- ILogarithmicFunctions<>.Log2P1, (Memberwise)
153-
- ILogarithmicFunctions<>.Log10, (Memberwise)
154-
- ILogarithmicFunctions<>.Log10P1, (Memberwise)
155-
- IExponentialFunctions<>.Exp, (Memberwise)
156-
- IExponentialFunctions<>.ExpM1, (Memberwise)
157-
- IExponentialFunctions<>.Exp2, (Memberwise)
158-
- IExponentialFunctions<>.Exp2M1, (Memberwise)
159-
- IExponentialFunctions<>.Exp10, (Memberwise)
160-
- IExponentialFunctions<>.Exp10M1, (Memberwise)
161-
- ITrigonometricFunctions<>.Acos, (Memberwise)
162-
- ITrigonometricFunctions<>.AcosPi, (Memberwise)
163-
- ITrigonometricFunctions<>.Asin, (Memberwise)
164-
- ITrigonometricFunctions<>.AsinPi, (Memberwise)
165-
- ITrigonometricFunctions<>.Atan, (Memberwise)
166-
- ITrigonometricFunctions<>.AtanPi, (Memberwise)
167-
- ITrigonometricFunctions<>.Cos, (Memberwise)
168-
- ITrigonometricFunctions<>.CosPi, (Memberwise)
169-
- ITrigonometricFunctions<>.Sin, (Memberwise)
170-
- ITrigonometricFunctions<>.SinPi, (Memberwise)
171-
- ITrigonometricFunctions<>.SinCos, (Memberwise)
152+
- `ILogarithmicFunctions<>.Log2P1`, (Memberwise)
153+
- `ILogarithmicFunctions<>.Log10`, (Memberwise)
154+
- `ILogarithmicFunctions<>.Log10P1`, (Memberwise)
155+
- `IExponentialFunctions<>.Exp`, (Memberwise)
156+
- `IExponentialFunctions<>.ExpM1`, (Memberwise)
157+
- `IExponentialFunctions<>.Exp2`, (Memberwise)
158+
- `IExponentialFunctions<>.Exp2M1`, (Memberwise)
159+
- `IExponentialFunctions<>.Exp10`, (Memberwise)
160+
- `IExponentialFunctions<>.Exp10M1`, (Memberwise)
161+
- `ITrigonometricFunctions<>.Acos`, (Memberwise)
162+
- `ITrigonometricFunctions<>.AcosPi`, (Memberwise)
163+
- `ITrigonometricFunctions<>.Asin`, (Memberwise)
164+
- `ITrigonometricFunctions<>.AsinPi`, (Memberwise)
165+
- `ITrigonometricFunctions<>.Atan`, (Memberwise)
166+
- `ITrigonometricFunctions<>.AtanPi`, (Memberwise)
167+
- `ITrigonometricFunctions<>.Cos`, (Memberwise)
168+
- `ITrigonometricFunctions<>.CosPi`, (Memberwise)
169+
- `ITrigonometricFunctions<>.Sin`, (Memberwise)
170+
- `ITrigonometricFunctions<>.SinPi`, (Memberwise)
171+
- `ITrigonometricFunctions<>.SinCos`, (Memberwise)
172172
- Returns a tuple of 2 Vectors (Sin, Cos)
173-
- ITrigonometricFunctions<>.SinCosPi, (Memberwise)
173+
- `ITrigonometricFunctions<>.SinCosPi`, (Memberwise)
174174
- Returns a tuple of 2 Vectors (Sin, Cos)
175-
- ITrigonometricFunctions<>.Tan, (Memberwise)
176-
- ITrigonometricFunctions<>.TanPi, (Memberwise)
177-
- ITrigonometricFunctions<>.DegreesToRadians, (Memberwise)
178-
- ITrigonometricFunctions<>.RadiansToDegrees, (Memberwise)
179-
- IHyperbolicFunctions<>.Acosh, (Memberwise)
180-
- IHyperbolicFunctions<>.Asinh, (Memberwise)
181-
- IHyperbolicFunctions<>.Atanh, (Memberwise)
182-
- IHyperbolicFunctions<>.Cosh, (Memberwise)
183-
- IHyperbolicFunctions<>.Sinh, (Memberwise)
184-
- IHyperbolicFunctions<>.Tanh, (Memberwise)
175+
- `ITrigonometricFunctions<>.Tan`, (Memberwise)
176+
- `ITrigonometricFunctions<>.TanPi`, (Memberwise)
177+
- `ITrigonometricFunctions<>.DegreesToRadians`, (Memberwise)
178+
- `ITrigonometricFunctions<>.RadiansToDegrees`, (Memberwise)
179+
- `IHyperbolicFunctions<>.Acosh`, (Memberwise)
180+
- `IHyperbolicFunctions<>.Asinh`, (Memberwise)
181+
- `IHyperbolicFunctions<>.Atanh`, (Memberwise)
182+
- `IHyperbolicFunctions<>.Cosh`, (Memberwise)
183+
- `IHyperbolicFunctions<>.Sinh`, (Memberwise)
184+
- `IHyperbolicFunctions<>.Tanh`, (Memberwise)
185185
- ScaleB(Vector x, VectorND\<int\> n)
186186
- ScaleB(Vector x, int n)
187187
- RoundToInt(Vector x)

‎src/Core/Silk.NET.BuildTools/Silk.NET.BuildTools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<SilkPublicApiExempt>true</SilkPublicApiExempt>
1010

1111
<!-- Workaround for issue https://github.com/microsoft/ClangSharp/issues/129 -->
12-
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' AND '$(PackAsTool)' != 'true'">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
12+
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' AND '$(PackAsTool)' != 'true' AND '$(SilkNukeBuild)' != 'true'">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
1313
</PropertyGroup>
1414

1515
<ItemGroup>

0 commit comments

Comments
 (0)